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/qt4.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/qt4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index bec81b4645..3155cbb6df 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -11,12 +11,16 @@ QT_DISTRO_FLAGS_linuxstdbase = "-sm" | |||
11 | 11 | ||
12 | QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite" | 12 | QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite" |
13 | 13 | ||
14 | QT_GLFLAGS ?= "" | ||
15 | |||
14 | QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ | 16 | QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ |
15 | -shared -no-nas-sound -no-nis \ | 17 | -shared -no-nas-sound -no-nis \ |
16 | -qt-gif -system-libjpeg -system-libpng -system-zlib \ | 18 | -qt-gif -system-libjpeg -system-libpng -system-zlib \ |
17 | -no-pch -qdbus -stl -glib -phonon -webkit \ | 19 | -no-pch -qdbus -stl -glib -phonon -webkit \ |
20 | -xmlpatterns -no-rpath -qt3support -silent \ | ||
18 | ${QT_SQL_DRIVER_FLAGS} \ | 21 | ${QT_SQL_DRIVER_FLAGS} \ |
19 | ${QT_DISTRO_FLAGS} " | 22 | ${QT_DISTRO_FLAGS} \ |
23 | ${QT_GLFLAGS}" | ||
20 | 24 | ||
21 | EXTRA_OEMAKE = "-e" | 25 | EXTRA_OEMAKE = "-e" |
22 | 26 | ||