From 97d1cfb1d152dbcb8385d6d56a44e31092c227f4 Mon Sep 17 00:00:00 2001
From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Wed, 25 Sep 2024 10:56:06 +0200
Subject: [PATCH] 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>
---
 resources.qrc                               | 2 +-
 src/gui/systray.cpp                         | 2 +-
 src/gui/tray/{Window.qml => MainWindow.qml} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/gui/tray/{Window.qml => MainWindow.qml} (100%)

diff --git a/resources.qrc b/resources.qrc
index c3c3a76cf..630251749 100644
--- 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
index a0153911e..456e7e618 100644
--- 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 b/src/gui/tray/MainWindow.qml
similarity index 100%
rename from src/gui/tray/Window.qml
rename to src/gui/tray/MainWindow.qml