mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-25 14:36:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7206 from nextcloud/backport/7199/stable-3.14

Browse source 
[stable-3.14] Bugfix/startup qml on windows
This commit is contained in:
Matthieu Gallien 2024-09-25 17:45:11 +02:00 committed by GitHub
commit 0b31df678e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 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>

3
src/gui/systray.cpp
View file

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

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

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