diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-12-06 12:11:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-08 15:24:28 +0000 |
commit | 1e459c83e5092b6e1e7d73dce22b29c9e3138607 (patch) | |
tree | 275f4b90f22172407b7ee0646a285184f5b21540 /meta/recipes-qt/qt4/qt-4.7.4.inc | |
parent | 2e50e9b8e6b136b8b8030bc1c7780eeae5db8fc2 (diff) | |
download | poky-1e459c83e5092b6e1e7d73dce22b29c9e3138607.tar.gz |
qt4: various tidy-ups
* -reduce-relocations is already specified in qt4.inc, no need to add it
in qt-${PV}.inc
* Add QT_GLFLAGS to QT_CONFIG_FLAGS in qt4.inc rather than spreading it
through other inc files.
* Add "-xmlpatterns -no-rpath -qt3support -silent" to QT_CONFIG_FLAGS in
qt4.inc rather than qt-${PV}.inc; these have been supported since at
least 4.5.2 and therefore shouldn't be version-specific.
* Move "-no-fast -silent -no-rpath" to EXTRA_OECONF in qt4-native.inc
rather than the versioned recipes for the same reason
* Remove redundant setting of LICENSE in qt4-embedded.inc
(From OE-Core rev: c9f714062c1100cedbcb2c16d16656e3f5442133)
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/qt-4.7.4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4.inc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc index 7a3ba54cc8..8fda9ce85a 100644 --- a/meta/recipes-qt/qt4/qt-4.7.4.inc +++ b/meta/recipes-qt/qt4/qt-4.7.4.inc | |||
@@ -43,9 +43,6 @@ do_configure_prepend() { | |||
43 | ${S}/configure | 43 | ${S}/configure |
44 | } | 44 | } |
45 | 45 | ||
46 | QT_GLFLAGS ?= "" | ||
47 | QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" | ||
48 | |||
49 | do_compile() { | 46 | do_compile() { |
50 | # Fixup missing wsegl header in some SGX SDKs | 47 | # Fixup missing wsegl header in some SGX SDKs |
51 | if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then | 48 | if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then |