From d4996b8dd4fc54b3034f81c5eebbef3916cf6020 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 9 Feb 2016 10:13:50 +0200 Subject: emulator: inherit qmake5 to get binaries correctly installed qt5-module puts binaries to separate -tools package, which is not installed by default. Use qmake5 instead, to get everything into one package. Change-Id: If8c25a5e65c63a75f6def0e879a11316a4e933dd Reviewed-by: Rainer Keller --- recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb | 2 +- recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb index ad0f9dd..6a55d33 100644 --- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb +++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb @@ -23,7 +23,7 @@ DESCRIPTION = "Proxy daemon for QtSimulator" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://proxy.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17" -inherit qt5-module +inherit qmake5 SRC_URI = " \ git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb index 888093d..af7410c 100644 --- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb +++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb @@ -23,7 +23,7 @@ DESCRIPTION = "SD-Card mount daemon for Emulator" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://sdcardmountd.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17" -inherit qt5-module +inherit qmake5 SRC_URI = " \ git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ -- cgit v1.2.3-54-g00ecf