summaryrefslogtreecommitdiffstats
path: root/launcher/src
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-08-02 14:42:12 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2018-08-02 14:42:12 +0000
commite1877c0c7c2add1dba21e64394ba06365c796edd (patch)
tree6d44196a395dc635fc97a555d688afcc13d7115a /launcher/src
parent69d5406160655c6b74ef2bd25a5d2ef31bea5c1f (diff)
parent83c4034d6374eb8b6d5a72c053c7e774cd6c3ffc (diff)
Merge "Improve output of multiple screen resolution"
Diffstat (limited to 'launcher/src')
-rw-r--r--launcher/src/main.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp
index ea3ed74..91a1d80 100644
--- a/launcher/src/main.cpp
+++ b/launcher/src/main.cpp
@@ -100,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);
}
@@ -156,9 +158,10 @@ int main(int argc, char *argv[])
// 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();