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:14:05 +0000 |
| commit | c9f714062c1100cedbcb2c16d16656e3f5442133 (patch) | |
| tree | 3a92d01cfe34c9c847cfcf5ce077c38e8ecd07d8 /meta/recipes-qt/qt4/qt4.inc | |
| parent | c2f6dc09a7663f69308558553be9420df3a81b6b (diff) | |
| download | openembedded-core-c9f714062c1100cedbcb2c16d16656e3f5442133.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
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
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" QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite" +QT_GLFLAGS ?= "" + QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ -shared -no-nas-sound -no-nis \ -qt-gif -system-libjpeg -system-libpng -system-zlib \ -no-pch -qdbus -stl -glib -phonon -webkit \ + -xmlpatterns -no-rpath -qt3support -silent \ ${QT_SQL_DRIVER_FLAGS} \ - ${QT_DISTRO_FLAGS} " + ${QT_DISTRO_FLAGS} \ + ${QT_GLFLAGS}" EXTRA_OEMAKE = "-e" |