Merge lp:~zeller-benjamin/ubuntu-system-settings/applauncherd into lp:ubuntu-system-settings

[Benjamin Zeller]

Prepare ubuntu-system-settings app for mapplauncherd

Prepare ubuntu-system-settings app for mapplauncherd

[lp:~zeller-benjamin/ubuntu-system-settings/applauncherd]

1602. By Benjamin Zeller on 2016-03-03

Prepare ubuntu-system-settings app for mapplauncherd

1603. By Benjamin Zeller on 2016-03-04

Fix build error

Unmerged revisions

1603. By Benjamin Zeller on 2016-03-04

Fix build error

1602. By Benjamin Zeller on 2016-03-03

Prepare ubuntu-system-settings app for mapplauncherd

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-11-05 21:25:13 +0000
+++ CMakeLists.txt	2016-03-04 07:19:42 +0000
@@ -1,6 +1,8 @@
 project(ubuntu-system-settings C CXX)
 cmake_minimum_required(VERSION 2.8.10)
 
+option(MAPPLAUNCHERD_ENABLED "Build with mapplauncherd support" ON)
+
 if(${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
    message(FATAL_ERROR "In-tree build attempt detected, aborting. Set your build dir outside your source dir, delete CMakeCache.txt from source root and try again.")
 endif()
@@ -47,6 +49,11 @@
 pkg_search_module(POLKIT_AGENT polkit-agent-1)
 pkg_search_module(CLICK REQUIRED click-0.4)
 
+if (MAPPLAUNCHERD_ENABLED)
+  set(MAPPLAUNCHERD_COMMAND_PREFIX "/usr/bin/invoker --type=ubuntu-components ")
+  pkg_check_modules(MAPPLAUNCH REQUIRED qdeclarative5-boostable)
+endif()
+
 find_program(XGETTEXT_BIN xgettext)
 find_program(MSGFMT_BIN msgfmt)
 find_program(INTLTOOL_MERGE intltool-merge)

=== modified file 'debian/control'
--- debian/control	2016-02-03 20:58:04 +0000
+++ debian/control	2016-03-04 07:19:42 +0000
@@ -49,6 +49,7 @@
                python3-dbus,
                python3-xdg,
                gir1.2-glib-2.0,
+               libmdeclarativecache5-dev (>= 1.1.13),
 Standards-Version: 3.9.6
 Homepage: https://launchpad.net/ubuntu-system-settings
 # If you aren't a member of ~system-settings-touch but need to upload packaging
@@ -95,6 +96,8 @@
          python3-dbus,
          python3-xdg,
          gir1.2-glib-2.0,
+         libmdeclarativecache5-0,
+         mapplauncherd-booster-ubuntu-components,
          qml-module-ubuntu-connectivity
 Recommends: ubuntu-system-settings-online-accounts,
             ubuntu-touch-sounds,

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-02-10 15:52:50 +0000
+++ src/CMakeLists.txt	2016-03-04 07:19:42 +0000
@@ -32,6 +32,13 @@
 
 add_executable(system-settings ${USS_SOURCES} ${QML_SOURCES} ${system-settings-resources})
 qt5_use_modules(system-settings Core Gui Quick Qml)
+
+if (MAPPLAUNCHERD_ENABLED)
+  add_definitions(-DMAPPLAUNCHERD_ENABLED)
+  target_link_libraries (system-settings ${MAPPLAUNCH_LDFLAGS})
+  target_compile_options(system-settings PRIVATE ${MAPPLAUNCH_CFLAGS})
+endif()
+
 target_link_libraries(system-settings SystemSettings ${GLIB_LDFLAGS})
 install(TARGETS system-settings RUNTIME DESTINATION bin)
 

=== modified file 'src/main.cpp'
--- src/main.cpp	2016-02-08 14:26:43 +0000
+++ src/main.cpp	2016-03-04 07:19:42 +0000
@@ -30,20 +30,29 @@
 #include <QQuickView>
 #include <QtQml>
 #include <QtQml/QQmlDebuggingEnabler>
+#include <QScopedPointer>
 static QQmlDebuggingEnabler debuggingEnabler(false);
 
+#ifdef MAPPLAUNCHERD_ENABLED
+#include <mdeclarativecache5/MDeclarativeCache>
+#endif
+
 using namespace SystemSettings;
 
-int main(int argc, char **argv)
+int Q_DECL_EXPORT main(int argc, char **argv)
 {
-    QGuiApplication app(argc, argv);
+  #ifdef MAPPLAUNCHERD_ENABLED
+      QScopedPointer<QGuiApplication> app(MDeclarativeCache::qApplication(argc, argv));
+  #else
+      QScopedPointer<QGuiApplication> app(new QGuiApplication(argc,argv));
+  #endif
 
     /* The testability driver is only loaded by QApplication but not by
      * QGuiApplication.  However, QApplication depends on QWidget which would
      * add some unneeded overhead => Let's load the testability driver on our
      * own.
      */
-    if (app.arguments().contains(QStringLiteral("-testability"))) {
+    if (app->arguments().contains(QStringLiteral("-testability"))) {
         QLibrary testLib(QStringLiteral("qttestability"));
         if (testLib.load()) {
             typedef void (*TasInitialize)(void);
@@ -78,24 +87,29 @@
      */
     QString defaultPlugin;
     QVariantMap pluginOptions;
-    parsePluginOptions(app.arguments(), defaultPlugin, pluginOptions);
+    parsePluginOptions(app->arguments(), defaultPlugin, pluginOptions);
 
-    QQuickView view;
+    #ifdef MAPPLAUNCHERD_ENABLED
+        QScopedPointer<QQuickView> view(MDeclarativeCache::qQuickView());
+    #else
+        QScopedPointer<QQuickView> view(new QQuickView);
+    #endif
     Utilities utils;
-    QObject::connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()),
+    QObject::connect(view->engine(), SIGNAL(quit()), app.data(), SLOT(quit()),
                      Qt::QueuedConnection);
     qmlRegisterType<QAbstractItemModel>();
     qmlRegisterType<SystemSettings::PluginManager>("SystemSettings", 1, 0, "PluginManager");
-    view.engine()->rootContext()->setContextProperty("Utilities", &utils);
-    view.setResizeMode(QQuickView::SizeRootObjectToView);
-    view.engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);
-    view.engine()->addImportPath(PLUGIN_QML_DIR);
-    view.rootContext()->setContextProperty("defaultPlugin", defaultPlugin);
-    view.rootContext()->setContextProperty("i18nDirectory", I18N_DIRECTORY);
-    view.rootContext()->setContextProperty("pluginOptions", pluginOptions);
-    view.rootContext()->setContextProperty("view", &view);
-    view.setSource(QUrl("qrc:/qml/MainWindow.qml"));
-    view.show();
-
-    return app.exec();
+
+    view->engine()->rootContext()->setContextProperty("Utilities", &utils);
+    view->setResizeMode(QQuickView::SizeRootObjectToView);
+    view->engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);
+    view->engine()->addImportPath(PLUGIN_QML_DIR);
+    view->rootContext()->setContextProperty("defaultPlugin", defaultPlugin);
+    view->rootContext()->setContextProperty("i18nDirectory", I18N_DIRECTORY);
+    view->rootContext()->setContextProperty("pluginOptions", pluginOptions);
+    view->rootContext()->setContextProperty("view", view.data());
+    view->setSource(QUrl("qrc:/qml/MainWindow.qml"));
+    view->show();
+
+    return app->exec();
 }

=== modified file 'ubuntu-system-settings.desktop.in.in'
--- ubuntu-system-settings.desktop.in.in	2014-10-01 14:10:47 +0000
+++ ubuntu-system-settings.desktop.in.in	2016-03-04 07:19:42 +0000
@@ -3,7 +3,7 @@
 _Categories=System;
 _Keywords=Preferences;Settings;
 Icon=@SETTINGS_SHARE_DIR@/system-settings.png
-Exec=system-settings %u
+Exec=@MAPPLAUNCHERD_COMMAND_PREFIX@system-settings %u
 Terminal=false
 Type=Application
 StartupNotify=true