summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@qt.io>2017-12-27 11:14:15 +0900
committerTasuku Suzuki <tasuku.suzuki@qt.io>2017-12-27 11:19:11 +0900
commiteac7433f794b6eca17521558dd4915b7593effc3 (patch)
treed8b56de512eea06297c9cd84cdcd7bd3e1b48107
parente9b63a2dccd72157c75475ca98b00d72d19bac6f (diff)
Fix build with libhomescreen and qlibwindowmanager with bitbakesandbox/ruke47/ces2018
https://gerrit.automotivelinux.org/gerrit/#/c/12579/ broke the build with bitbake because tests are not perfect. libhomescreen: pkg name used to be homescreen but now it is libhomescreen qlibwindowmanager: the test needs Qt Change-Id: Ib43ac5d0cd1189a3490a60b54760fefc9b15954c Signed-off-by: Tasuku Suzuki <tasuku.suzuki@qt.io>
-rw-r--r--app/config.tests/libhomescreen/libhomescreen.pro2
-rw-r--r--app/config.tests/qlibwindowmanager/qlibwindowmanager.pro2
-rw-r--r--app/main.cpp7
3 files changed, 6 insertions, 5 deletions
diff --git a/app/config.tests/libhomescreen/libhomescreen.pro b/app/config.tests/libhomescreen/libhomescreen.pro
index eb4e8f3..7d43112 100644
--- a/app/config.tests/libhomescreen/libhomescreen.pro
+++ b/app/config.tests/libhomescreen/libhomescreen.pro
@@ -2,4 +2,4 @@ SOURCES = libhomescreen.cpp
CONFIG -= qt
CONFIG += link_pkgconfig
-PKGCONFIG += homescreen
+PKGCONFIG += libhomescreen
diff --git a/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro b/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro
index 96721e8..cb51d98 100644
--- a/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro
+++ b/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro
@@ -1,5 +1,5 @@
SOURCES = qlibwindowmanager.cpp
-CONFIG -= qt
+CONFIG += qt
CONFIG += link_pkgconfig
PKGCONFIG += qlibwindowmanager
diff --git a/app/main.cpp b/app/main.cpp
index a75e779..856acfc 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -55,10 +55,11 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine;
QQmlContext *context = engine.rootContext();
QUrl bindingAddress;
+ int port = 0;
QString secret;
if (positionalArguments.length() == 2) {
- int port = positionalArguments.takeFirst().toInt();
- QString secret = positionalArguments.takeFirst();
+ port = positionalArguments.takeFirst().toInt();
+ secret = positionalArguments.takeFirst();
bindingAddress.setScheme(QStringLiteral("ws"));
bindingAddress.setHost(QStringLiteral("localhost"));
bindingAddress.setPort(port);
@@ -92,7 +93,7 @@ int main(int argc, char *argv[])
// HomeScreen
LibHomeScreen* hs = new LibHomeScreen();
std::string token = secret.toStdString();
- hs->init(port, secret.to);
+ hs->init(port, token.c_str());
// Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
json_object *appnameJ = nullptr;