]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Replaced .engine() by pointer access b/c of backward compatibility
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Sun, 8 Dec 2019 12:18:46 +0000 (13:18 +0100)
committerDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Sun, 8 Dec 2019 12:18:46 +0000 (13:18 +0100)
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
src/gui/systray.cpp

index 6e326c4cd9dba3aec5b7bd8e8e12bb706335e6eb..8c27009808f6eb93ccefbb8cc2711882b4ad023d 100644 (file)
@@ -39,14 +39,15 @@ Systray::Systray() // TODO: make singleton, provide ::instance()
     , _accountMenuModel(nullptr)
 {
     // Create QML tray engine, build component, set C++ backend context used in window.qml
+    // Use pointer instead of engine() helper function until Qt 5.12 is minimum standard
     QQmlEngine *engine = new QQmlEngine;
     QQmlComponent systray(engine, QUrl(QStringLiteral("qrc:/qml/src/gui/tray/init.qml")));
     _trayContext = engine->contextForObject(systray.create());
 
     _accountMenuModel = UserModel::instance();
-    systray.engine()->addImageProvider("avatars", new ImageProvider);
-    systray.engine()->rootContext()->setContextProperty("systrayBackend", _accountMenuModel);
-    
+
+    engine->addImageProvider("avatars", new ImageProvider);
+    engine->rootContext()->setContextProperty("systrayBackend", _accountMenuModel);
 
     // TODO: hack to pass the icon to QML
     //ctxt->setContextProperty("theme", QLatin1String("colored"));