Merge pull request #7199 from nextcloud/bugfix/startupQmlOnWindows

Bugfix/startup qml on windows
nextcloud · Sep 25, 2024 · ea27b29 · ea27b29
2 parents ca7c7cb + 92f7247
commit ea27b29
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/resources.qrc b/resources.qrc
@@ -21,7 +21,7 @@
         <file>src/gui/filedetails/ShareDetailsPage.qml</file>
         <file>src/gui/filedetails/ShareeSearchField.qml</file>
         <file>src/gui/filedetails/ShareView.qml</file>
-        <file>src/gui/tray/Window.qml</file>
+        <file>src/gui/tray/MainWindow.qml</file>
         <file>src/gui/tray/UserLine.qml</file>
         <file>src/gui/tray/HeaderButton.qml</file>
         <file>src/gui/tray/SyncStatus.qml</file>

diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
@@ -70,6 +70,7 @@ void Systray::setTrayEngine(QQmlApplicationEngine *trayEngine)
 
     _trayEngine->setNetworkAccessManagerFactory(&_accessManagerFactory);
 
+    _trayEngine->addImportPath(QCoreApplication::applicationDirPath() + "/qml");
     _trayEngine->addImportPath("qrc:/qml/theme");
     _trayEngine->addImageProvider("avatars", new ImageProvider);
     _trayEngine->addImageProvider(QLatin1String("svgimage-custom-color"), new OCC::Ui::SvgImageProvider);
@@ -119,7 +120,7 @@ void Systray::create()
             _trayEngine->rootContext()->setContextProperty("activityModel", &_fakeActivityModel);
         }
 
-        QQmlComponent trayWindowComponent(trayEngine(), QStringLiteral("qrc:/qml/src/gui/tray/Window.qml"));
+        QQmlComponent trayWindowComponent(trayEngine(), QStringLiteral("qrc:/qml/src/gui/tray/MainWindow.qml"));
 
         if(trayWindowComponent.isError()) {
             qCWarning(lcSystray) << trayWindowComponent.errorString();

diff --git a/src/gui/tray/Window.qml → src/gui/tray/MainWindow.qml b/src/gui/tray/Window.qml → src/gui/tray/MainWindow.qml
@@ -12,9 +12,10 @@
  * for more details.
  */
 
+import QtQml
 import QtQuick
-import QtQuick.Window
 import QtQuick.Controls
+import QtQuick.Window
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 import Qt.labs.platform as NativeDialogs