[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=cc148ce

The following commit has been merged in the master branch:
commit cc148cea89e1f90e0247c33c9d45cd6602ab63b6
Author: Martin Gräßlin <mgraesslin at kde.org>
Date:   Mon Sep 7 17:42:19 2015 +0200

    Setup KDeclarative before loading the Qml file
    
    Otherwise methods injected into the engine by KDeclarative are not
    available in the loaded qml.
    
    REVIEW: 124419
---
 app/main.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/main.cpp b/app/main.cpp
index 569bdf8..cba50fa 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -39,11 +39,13 @@ int main(int argc, char *argv[])
         aboutData.processCommandLine(&parser);
     }
  
-    QQmlApplicationEngine engine(QUrl("qrc:/qml/main.qml"));
+    QQmlApplicationEngine engine;
 
     KDeclarative::KDeclarative kdeclarative;
     kdeclarative.setDeclarativeEngine(&engine);
     kdeclarative.setupBindings();
 
+    engine.load(QUrl("qrc:/qml/main.qml"));
+
     return app.exec();
 }

-- 
kdeconnect packaging