rename our Window component to MainWindow to not use an existing name

we import QtQuick module that also define Window component name to avoid any ambiguity, just use a different name on our side Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
nextcloud · Sep 25, 2024 · 97d1cfb · 97d1cfb
1 parent c67456b
commit 97d1cfb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 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
@@ -119,7 +119,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