diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-01-03 13:41:32 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-04 12:08:31 +0000 |
| commit | 99a6e1a3a453c17575439723599da6bef62175bb (patch) | |
| tree | a7661082f892827f1895f079a5ccbacb6ca1c4cd /meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | |
| parent | 120ea473c4bff1eeeb0a31e9d3c56ae2c7dae9a4 (diff) | |
| download | poky-99a6e1a3a453c17575439723599da6bef62175bb.tar.gz | |
qt4: fix incorrect architecture for qt4 tools
Don't install the native staging versions of the qt4 tools in the bin
directory; we have been doing this for a very long time but it is no
longer necessary since we specify them via the QMAKE_UIC, QMAKE_MOC etc.
variables. Doing so was sometimes resulting in those executables being
the ones that end up being packaged (probably only sometimes due to
different date/time values on the staging files and the interaction
with make).
Fixes [YOCTO #1856].
(From OE-Core rev: dc154d698b3b455a35b65935f7f04a3b4f72f8b6)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb index 1d7104c5bc..9b66d0327c 100644 --- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb +++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | require qt-${PV}.inc | 1 | require qt-${PV}.inc |
| 2 | require qt4-embedded.inc | 2 | require qt4-embedded.inc |
| 3 | 3 | ||
| 4 | PR = "${INC_PR}.5" | 4 | PR = "${INC_PR}.6" |
| 5 | 5 | ||
| 6 | QT_CONFIG_FLAGS_append_armv6 = " -no-neon " | 6 | QT_CONFIG_FLAGS_append_armv6 = " -no-neon " |
| 7 | 7 | ||