Merge branch 'stable'

CMakeLists.txt

@@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 2.8.12)
 find_package(ECM 0.0.9 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake)
 
-find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test)
+find_package(Qt5 5.2 REQUIRED COMPONENTS Quick)
 find_package(KF5 REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons IconThemes)
 find_package(Qca-qt5 2.1.0 REQUIRED)
 
@@ -49,7 +49,7 @@ add_subdirectory(plugins)
 add_subdirectory(plasmoid)
 add_subdirectory(cli)
 add_subdirectory(fileitemactionplugin)
-
+if(BUILD_TESTING)
     add_subdirectory(tests)
-
+endif()
 install(PROGRAMS kdeconnect-non-plasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})

app/main.cpp

@@ -26,7 +26,7 @@
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
-    KAboutData aboutData("kdeconnect-kde", i18n("Awesome App"), "1.0", i18n("KDE Connect App"), KAboutLicense::GPL, i18n("(c) 2015, Aleix Pol Gonzalez"));
+    KAboutData aboutData("kdeconnect.app", i18n("Awesome App"), "1.0", i18n("KDE Connect App"), KAboutLicense::GPL, i18n("(c) 2015, Aleix Pol Gonzalez"));
     aboutData.addAuthor(i18n("Aleix Pol Gonzalez"), i18n("Maintainer"), "aleixpol@kde.org");
     KAboutData::setApplicationData(aboutData);
 
@@ -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();
 }

tests/CMakeLists.txt

@@ -1,3 +1,4 @@
+find_package(Qt5 REQUIRED COMPONENTS Test)
 find_package(KF5 REQUIRED COMPONENTS KIO)
 
 include_directories(