fixup! refactor: Port to QML modules

Author: CarlSchwan

src/gui/owncloudgui.cpp

@@ -21,15 +21,6 @@
 #include "settingsdialog.h"
 #include "syncconflictsmodel.h"
 #include "syncengine.h"
-#include "filedetails/datefieldbackend.h"
-#include "filedetails/filedetails.h"
-#include "filedetails/shareemodel.h"
-#include "filedetails/sharemodel.h"
-#include "filedetails/sortedsharemodel.h"
-#include "tray/sortedactivitylistmodel.h"
-#include "tray/syncstatussummary.h"
-#include "tray/unifiedsearchresultslistmodel.h"
-#include "integration/fileactionsmodel.h"
 #include "filesystem.h"
 
 #ifdef WITH_LIBCLOUDPROVIDERS

src/gui/systray.cpp

@@ -120,7 +120,7 @@ void Systray::create()
 	qWarning() << "has error" << trayWindowComponent.isError();
 
         if(trayWindowComponent.isError()) {
-            qCWarning(lcSystray) << trayWindowComponent.errorString();
+            qWarning() << trayWindowComponent.errorString();
         } else {
             _trayWindow.reset(qobject_cast<QQuickWindow*>(trayWindowComponent.create()));
         }

src/gui/tray/CMakeLists.txt

@@ -28,7 +28,7 @@ add_library(nextcloudTray STATIC
     usermodel.h
 )
 
-target_link_libraries(nextcloudTray PRIVATE nextcloudCore)
+target_link_libraries(nextcloudTray PRIVATE nextcloudCore Qt::QmlIntegration)
 
 qt_add_qml_module(nextcloudTray
     URI com.nextcloud.desktopclient.tray

src/gui/tray/activitylistmodel.h

@@ -8,7 +8,7 @@
 #define ACTIVITYLISTMODEL_H
 
 #include <QtCore>
-#include <qqmlregistration.h>
+#include <qqmlintegration.h>
 
 #include "activitydata.h"
 #include "accountstate.h"