diff options
author | Mikko Levonmaa <mikko.levonmaa@gmail.com> | 2012-12-02 10:04:53 -0800 |
---|---|---|
committer | Mikko Levonmaa <mikko.levonmaa@gmail.com> | 2012-12-03 11:15:35 -0800 |
commit | ff173560e260798e7ed50b9e6cef3d41e8349609 (patch) | |
tree | 464680fe7cec38f3a17d1507361f5454f5036340 /recipes-qt/qt5/qtbase.inc | |
parent | c3e8e8de5931e8aac14f6555237e53b1e32502e9 (diff) | |
download | meta-qt5-ff173560e260798e7ed50b9e6cef3d41e8349609.tar.gz |
qtbase: partially resolves module pri installation
The pri files get correctly placed under the work dir, but fail
to stage correctly. Also there are some packaging issues
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase.inc')
-rw-r--r-- | recipes-qt/qt5/qtbase.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 115bb469..e85ff6e1 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc | |||
@@ -6,8 +6,8 @@ SRC_URI += " \ | |||
6 | file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ | 6 | file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ |
7 | " | 7 | " |
8 | 8 | ||
9 | # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h | 9 | # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h |
10 | DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms" | 10 | DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" |
11 | 11 | ||
12 | QT_MODULE_FLAGS ?= "-system-xcb" | 12 | QT_MODULE_FLAGS ?= "-system-xcb" |
13 | 13 | ||
@@ -16,8 +16,6 @@ INC_PR = "r0" | |||
16 | QT_BASE_NAME = "qt5" | 16 | QT_BASE_NAME = "qt5" |
17 | QT_DIR_NAME = "qt5" | 17 | QT_DIR_NAME = "qt5" |
18 | 18 | ||
19 | export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++" | ||
20 | |||
21 | # Qt uses atomic instructions not supported in thumb mode | 19 | # Qt uses atomic instructions not supported in thumb mode |
22 | ARM_INSTRUCTION_SET = "arm" | 20 | ARM_INSTRUCTION_SET = "arm" |
23 | 21 | ||