diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-09 10:13:50 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-09 10:15:05 +0000 |
| commit | d4996b8dd4fc54b3034f81c5eebbef3916cf6020 (patch) | |
| tree | 5be6b5e7fb702c015d0eb3f39ed650c5f73065ad | |
| parent | e58e1e259754a721f108c3732d638c803ab70aaa (diff) | |
| download | meta-boot2qt-d4996b8dd4fc54b3034f81c5eebbef3916cf6020.tar.gz | |
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 <rainer.keller@theqtcompany.com>
| -rw-r--r-- | recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb | 2 | ||||
| -rw-r--r-- | 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" | |||
| 23 | LICENSE = "QtEnterprise" | 23 | LICENSE = "QtEnterprise" |
| 24 | LIC_FILES_CHKSUM = "file://proxy.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17" | 24 | LIC_FILES_CHKSUM = "file://proxy.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17" |
| 25 | 25 | ||
| 26 | inherit qt5-module | 26 | inherit qmake5 |
| 27 | 27 | ||
| 28 | SRC_URI = " \ | 28 | SRC_URI = " \ |
| 29 | git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ | 29 | 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" | |||
| 23 | LICENSE = "QtEnterprise" | 23 | LICENSE = "QtEnterprise" |
| 24 | LIC_FILES_CHKSUM = "file://sdcardmountd.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17" | 24 | LIC_FILES_CHKSUM = "file://sdcardmountd.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17" |
| 25 | 25 | ||
| 26 | inherit qt5-module | 26 | inherit qmake5 |
| 27 | 27 | ||
| 28 | SRC_URI = " \ | 28 | SRC_URI = " \ |
| 29 | git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ | 29 | git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ |