Revert "Use appid between homescreen-service and apps"

[apps/launcher.git] / launcher / src / main.cpp

diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp
index 50f1303..91a1d80 100644 (file)
--- a/launcher/src/main.cpp
+++ b/launcher/src/main.cpp
@@ -22,6 +22,7 @@
 #include <QtQml/QQmlContext>
 #include <QtQml/qqml.h>
 #include <QQuickWindow>
+#include <QThread>
 
 #include <qlibwindowmanager.h>
 #include "applicationlauncher.h"
@@ -99,6 +100,8 @@ int main(int argc, char *argv[])
         exit(EXIT_FAILURE);
     }
 
+    AGLScreenInfo screenInfo(layoutHandler->get_scale_factor());
+
     if (layoutHandler->requestSurface(myname) != 0) {
         exit(EXIT_FAILURE);
     }
@@ -143,11 +146,22 @@ int main(int argc, char *argv[])
     query.addQueryItem(QStringLiteral("token"), token);
     bindingAddress.setQuery(query);
 
+    const QByteArray hack_delay = qgetenv("HMI_LAUNCHER_STARTUP_DELAY");
+    int delay_time = 1;
+
+    if (!hack_delay.isEmpty()) {
+       delay_time = (QString::fromLocal8Bit(hack_delay)).toInt();
+    }
+
+    QThread::sleep(delay_time);
+    qDebug("Sleep %d sec to resolve race condtion between HomeScreen and Launcher", delay_time);
+
     // mail.qml loading
     QQmlApplicationEngine engine;
-    engine.rootContext()->setContextProperty("layoutHandler", layoutHandler);
-    engine.rootContext()->setContextProperty("homescreenHandler", homescreenHandler);
-    engine.rootContext()->setContextProperty("launcher", launcher);
+    engine.rootContext()->setContextProperty(QStringLiteral("layoutHandler"), layoutHandler);
+    engine.rootContext()->setContextProperty(QStringLiteral("homescreenHandler"), homescreenHandler);
+    engine.rootContext()->setContextProperty(QStringLiteral("launcher"), launcher);
+    engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
     engine.load(QUrl(QStringLiteral("qrc:/Launcher.qml")));
 
     QObject *root = engine.rootObjects().first();