summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-01-03 13:41:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-04 12:08:31 (GMT)
commit99a6e1a3a453c17575439723599da6bef62175bb (patch)
treea7661082f892827f1895f079a5ccbacb6ca1c4cd /meta/recipes-qt
parent120ea473c4bff1eeeb0a31e9d3c56ae2c7dae9a4 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4.inc4
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb2
3 files changed, 2 insertions, 6 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index 8fda9ce..9ddb055 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -50,10 +50,6 @@ do_compile() {
50 fi 50 fi
51 51
52 unset CFLAGS CXXFLAGS 52 unset CFLAGS CXXFLAGS
53 install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
54 install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
55 install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
56 install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
57 53
58 oe_runmake ${EXTRA_ENV} 54 oe_runmake ${EXTRA_ENV}
59} 55}
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 1d7104c..9b66d03 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 @@
1require qt-${PV}.inc 1require qt-${PV}.inc
2require qt4-embedded.inc 2require qt4-embedded.inc
3 3
4PR = "${INC_PR}.5" 4PR = "${INC_PR}.6"
5 5
6QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
7 7
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
index 3263c93..6dedf00 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
@@ -1,7 +1,7 @@
1require qt4-x11-free.inc 1require qt4-x11-free.inc
2require qt-${PV}.inc 2require qt-${PV}.inc
3 3
4PR = "${INC_PR}.5" 4PR = "${INC_PR}.6"
5 5
6QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
7 7