Skip to content

Commit

Permalink
wip qml
Browse files Browse the repository at this point in the history
  • Loading branch information
TheOneRing committed Feb 23, 2024
1 parent 7beee2d commit 1ef3248
Show file tree
Hide file tree
Showing 18 changed files with 502 additions and 614 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)

find_package(QT 6.2 NAMES Qt6 COMPONENTS Core REQUIRED)

find_package(Qt6 COMPONENTS Core Concurrent Network Widgets Xml REQUIRED)
find_package(Qt6 COMPONENTS Core Concurrent Network Widgets Xml Quick QuickWidgets QuickControls2 REQUIRED)
find_package(Qt6LinguistTools REQUIRED)
get_target_property (QT_QMAKE_EXECUTABLE Qt::qmake IMPORTED_LOCATION)
message(STATUS "Using Qt ${QT_VERSION} (${QT_QMAKE_EXECUTABLE})")
Expand Down
16 changes: 13 additions & 3 deletions src/gui/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
include(ECMAddAppIcon)
include(ECMQmlModule)

find_package(KDSingleApplication-qt6 1.0.0 REQUIRED)

Expand Down Expand Up @@ -37,7 +38,6 @@ set(client_SRCS
folder.cpp
folderman.cpp
folderstatusmodel.cpp
folderstatusdelegate.cpp
folderwatcher.cpp
generalsettings.cpp
ignorelisteditor.cpp
Expand Down Expand Up @@ -102,15 +102,25 @@ add_subdirectory(loginrequireddialog)

add_library(owncloudCore STATIC ${final_src})
set_target_properties(owncloudCore PROPERTIES AUTOUIC ON AUTORCC ON)
# for the generated qml module
target_include_directories(owncloudCore PRIVATE models)
target_link_libraries(owncloudCore
PUBLIC
Qt::Widgets Qt::Network Qt::Xml
Qt::Widgets Qt::Network Qt::Xml Qt::Quick Qt::QuickWidgets Qt::QuickControls2
newwizard folderwizard spaces loginrequireddialog
libsync
Qt6Keychain::Qt6Keychain
)

apply_common_target_settings(owncloudCore)
ecm_add_qml_module (owncloudCore
URI org.ownCloud.qmlcomponents
VERSION 1.0
NAMESPACE OCC
# TODO: main.cpp: qml_register_types_org_ownCloud_qmlcomponents
QT_NO_PLUGIN
QML_FILES qml/tree.qml
)


add_subdirectory(spaces)
Expand Down Expand Up @@ -159,7 +169,7 @@ set_target_properties(owncloud PROPERTIES
AUTORCC ON
)
apply_common_target_settings(owncloud)
target_link_libraries(owncloud owncloudCore owncloudResources KDAB::kdsingleapplication )
target_link_libraries(owncloud PUBLIC owncloudCore owncloudResources KDAB::kdsingleapplication )

MESSAGE(STATUS "OWNCLOUD_SIDEBAR_ICONS: ${APPLICATION_ICON_NAME}: ${OWNCLOUD_SIDEBAR_ICONS}")

Expand Down
Loading

0 comments on commit 1ef3248

Please sign in to comment.