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-x11-free.inc | |
| parent | c2f6dc09a7663f69308558553be9420df3a81b6b (diff) | |
| download | openembedded-core-contrib-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-x11-free.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 029c61e447..53a44ad691 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -5,12 +5,12 @@ HOMEPAGE = "http://qt.nokia.com" SECTION = "x11/libs" DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" -INC_PR = "r34" +INC_PR = "r35" QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" QT_GLFLAGS_qemuppc = "-opengl" -QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}" +QT_CONFIG_FLAGS += "-no-xinerama -no-xkb" QT_BASE_NAME ?= "qt4" QT_BASE_LIB ?= "libqt" |