wip qml

CMakeLists.txt

@@ -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})")

src/gui/CMakeLists.txt

@@ -1,4 +1,5 @@
 include(ECMAddAppIcon)
+include(ECMQmlModule)
 
 find_package(KDSingleApplication-qt6 1.0.0 REQUIRED)
 
@@ -37,7 +38,6 @@ set(client_SRCS
     folder.cpp
     folderman.cpp
     folderstatusmodel.cpp
-    folderstatusdelegate.cpp
     folderwatcher.cpp
     generalsettings.cpp
     ignorelisteditor.cpp
@@ -102,15 +102,27 @@ 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/FolderDelegate.qml
+        qml/FolderError.qml
+)
 
 
 add_subdirectory(spaces)
@@ -159,7 +171,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}")