mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-22 12:25:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Matthieu Gallien 2024-09-25 10:56:06 +02:00 committed by Matthieu Gallien
parent c67456b5b7
commit 97d1cfb1d1
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources.qrc
View file

@ -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>

2
src/gui/systray.cpp
View file

@ -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();

0
src/gui/tray/Window.qml → src/gui/tray/MainWindow.qml
View file