aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/app.pri6
-rw-r--r--app/main.cpp8
2 files changed, 7 insertions, 7 deletions
diff --git a/app/app.pri b/app/app.pri
index d0e1f99..88eca22 100644
--- a/app/app.pri
+++ b/app/app.pri
@@ -2,13 +2,13 @@ TEMPLATE = app
load(configure)
-qtCompileTest(libhomescreen)
+qtCompileTest(qlibhomescreen)
qtCompileTest(qlibwindowmanager)
-config_libhomescreen {
+config_qlibhomescreen {
CONFIG += link_pkgconfig
PKGCONFIG += qlibhomescreen
- DEFINES += HAVE_LIBHOMESCREEN
+ DEFINES += HAVE_QLIBHOMESCREEN
}
config_qlibwindowmanager {
diff --git a/app/main.cpp b/app/main.cpp
index 2a57d08..ab74471 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -28,7 +28,7 @@
#include <QQuickWindow>
-#ifdef HAVE_LIBHOMESCREEN
+#ifdef HAVE_QLIBHOMESCREEN
#include <qlibhomescreen.h>
#endif
#ifdef HAVE_QLIBWINDOWMANAGER
@@ -94,21 +94,21 @@ int main(int argc, char *argv[])
});
#endif
-#ifdef HAVE_LIBHOMESCREEN
+#ifdef HAVE_QLIBHOMESCREEN
// HomeScreen
QLibHomeScreen* qhs = new QLibHomeScreen();
std::string token = secret.toStdString();
qhs->init(port, token.c_str());
// Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
qhs->set_event_handler(QLibHomeScreen::Event_ShowWindow, [qwm, myname](json_object *object){
- qwm->activateWindow(myname);
+ qwm->activateWindow(myname, "split.main");
});
#endif
engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
QObject *root = engine.rootObjects().first();
QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-#ifdef HAVE_LIBHOMESCREEN
+#ifdef HAVE_QLIBHOMESCREEN
qhs->setQuickWindow(window);
#endif
#ifdef HAVE_QLIBWINDOWMANAGER