fixup! refactor: Port to QML modules

Author: CarlSchwan

CMakeLists.txt

@@ -94,6 +94,7 @@ include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(ECMMarkNonGuiExecutable)
 include(ECMSetupVersion)
+include(ECMQmlModule)
 
 #include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMEnableSanitizers)

src/3rdparty/kirigami/wheelhandler.h

@@ -169,6 +169,7 @@ class WheelFilterItem : public QQuickItem
 class WheelHandler : public QObject
 {
     Q_OBJECT
+    QML_NAMED_ELEMENT(WheelHandler)
 
     /**
      * @brief This property holds the Qt Quick Flickable that the WheelHandler will control.

src/gui/CMakeLists.txt

@@ -150,6 +150,8 @@ set(client_SRCS
     syncrunfilelog.cpp
     systray.h
     systray.cpp
+    types.h
+    types.cpp
     userinfo.h
     userinfo.cpp
     vfsdownloaderrordialog.h
@@ -487,13 +489,14 @@ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib")
 endif()
 
-add_library(nextcloudCore STATIC ${final_src})
+add_library(nextcloudCore STATIC)
 
-qt_add_qml_module(nextcloudCore
+ecm_add_qml_module(nextcloudCore
     URI com.nextcloud.desktopclient
+    GENERATE_PLUGIN_SOURCE
     IMPORTS
     	com.nextcloud.desktopclient.tray
-	com.nextcloud.desktopclient.filedetails
+        com.nextcloud.desktopclient.filedetails
     QML_FILES 
         UserStatusMessageView.qml
         UserStatusSelectorPage.qml
@@ -502,6 +505,8 @@ qt_add_qml_module(nextcloudCore
         UserStatusSetStatusView.qml
         PredefinedStatusButton.qml
         ErrorBox.qml
+    SOURCES
+        ${final_src}
 )
 
 target_link_libraries(nextcloudCore PUBLIC

src/gui/EmojiPicker.qml

@@ -8,7 +8,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 
 import Style
-import com.nextcloud.desktopclient 1.0 as NC
+import com.nextcloud.desktopclient as NC
 import "./tray"
 
 ColumnLayout {

src/gui/filedetails/CMakeLists.txt

@@ -4,8 +4,9 @@
 
 add_library(nextcloudFileDetails STATIC)
 
-qt_add_qml_module(nextcloudFileDetails
+ecm_add_qml_module(nextcloudFileDetails
     URI com.nextcloud.desktopclient.filedetails
+    GENERATE_PLUGIN_SOURCE
     QML_FILES 
         FileActivityView.qml
         FileDetailsPage.qml

src/gui/main.cpp

@@ -35,6 +35,7 @@
 #include <QQmlExtensionPlugin>
 
 Q_IMPORT_QML_PLUGIN(com_nextcloud_desktopclient_trayPlugin)
+Q_IMPORT_QML_PLUGIN(com_nextcloud_desktopclient_filedetailsPlugin)
 
 using namespace OCC;
 

src/gui/tray/CMakeLists.txt

@@ -2,36 +2,11 @@
 # SPDX-FileContributor: Carl Schwan <carl.schwan@nextcloud.com>
 # SPDX-License-Identifier: BSD-3-Clause
 
-add_library(nextcloudTray STATIC
-    activitydata.cpp
-    activitydata.h
-    activitylistmodel.cpp
-    activitylistmodel.h
-    asyncimageresponse.cpp
-    fileactivitylistmodel.cpp
-    fileactivitylistmodel.h
-    notificationhandler.cpp
-    notificationhandler.h
-    sortedactivitylistmodel.cpp
-    sortedactivitylistmodel.h
-    svgimageprovider.cpp
-    svgimageprovider.h
-    syncstatussummary.cpp
-    syncstatussummary.h
-    talkreply.cpp
-    trayimageprovider.cpp
-    unifiedsearchresult.cpp
-    unifiedsearchresult.h
-    unifiedsearchresultslistmodel.cpp
-    unifiedsearchresultslistmodel.h
-    usermodel.cpp
-    usermodel.h
-)
-
-target_link_libraries(nextcloudTray PRIVATE nextcloudCore Qt::QmlIntegration)
+add_library(nextcloudTray STATIC)
 
-qt_add_qml_module(nextcloudTray
+ecm_add_qml_module(nextcloudTray
     URI com.nextcloud.desktopclient.tray
+    GENERATE_PLUGIN_SOURCE
     QML_FILES 
         MainWindow.qml
         UserLine.qml
@@ -66,4 +41,30 @@ qt_add_qml_module(nextcloudTray
         ListItemLineAndSubline.qml
         TrayFoldersMenuButton.qml
         TrayFolderListItem.qml
+    SOURCES
+        activitydata.cpp
+        activitydata.h
+        activitylistmodel.cpp
+        activitylistmodel.h
+        asyncimageresponse.cpp
+        fileactivitylistmodel.cpp
+        fileactivitylistmodel.h
+        notificationhandler.cpp
+        notificationhandler.h
+        sortedactivitylistmodel.cpp
+        sortedactivitylistmodel.h
+        svgimageprovider.cpp
+        svgimageprovider.h
+        syncstatussummary.cpp
+        syncstatussummary.h
+        talkreply.cpp
+        trayimageprovider.cpp
+        unifiedsearchresult.cpp
+        unifiedsearchresult.h
+        unifiedsearchresultslistmodel.cpp
+        unifiedsearchresultslistmodel.h
+        usermodel.cpp
+        usermodel.h
 )
+
+target_link_libraries(nextcloudTray PRIVATE nextcloudCore Qt::QmlIntegration)

src/gui/types.h

@@ -16,38 +16,38 @@ class UserStatusForeign
 {
     Q_GADGET
     QML_NAMED_ELEMENT(UserStatus)
-    QML_FOREIGN(UserStatus)
-    QML_UNCREATABLE()
+    QML_FOREIGN(OCC::UserStatus)
+    QML_UNCREATABLE("")
 };
 
 class ShareeForeign 
 {
     Q_GADGET
     QML_NAMED_ELEMENT(Sharee)
-    QML_FOREIGN(Sharee)
-    QML_UNCREATABLE()
+    QML_FOREIGN(OCC::Sharee)
+    QML_UNCREATABLE("")
 };
 
 class ClientSideEncryptionTokenSelectorForeign : public QObject
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(ClientSideEncryptionTokenSelector)
-    QML_FOREIGN(ClientSideEncryptionTokenSelector)
-    QML_UNCREATABLE()
+    QML_FOREIGN(OCC::ClientSideEncryptionTokenSelector)
+    QML_UNCREATABLE("")
 };
 
 class ThemeForeign : public QObject
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(Theme)
-    QML_FOREIGN(Theme)
+    QML_FOREIGN(OCC::Theme)
     QML_SINGLETON
-    QML_UNCREATABLE()
+    QML_UNCREATABLE("")
 
-    static Theme *create(QQmlEngine *, QJSEngine *engine)
+    static OCC::Theme *create(QQmlEngine *, QJSEngine *engine)
     {
-        auto _instance = Theme::instance();
-	QQmlEngine::setObjectOwnership(_instance, QJSEngine::CppOwnership);
+        auto _instance = OCC::Theme::instance();
+        QQmlEngine::setObjectOwnership(_instance, QJSEngine::CppOwnership);
         return _instance;
     }
 };