summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-x11-free.inc
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-12-06 12:11:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-08 15:24:28 +0000
commit1e459c83e5092b6e1e7d73dce22b29c9e3138607 (patch)
tree275f4b90f22172407b7ee0646a285184f5b21540 /meta/recipes-qt/qt4/qt4-x11-free.inc
parent2e50e9b8e6b136b8b8030bc1c7780eeae5db8fc2 (diff)
downloadpoky-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-x11-free.inc')
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc4
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"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r34" 8INC_PR = "r35"
9 9
10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"
12QT_GLFLAGS_qemuppc = "-opengl" 12QT_GLFLAGS_qemuppc = "-opengl"
13QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}" 13QT_CONFIG_FLAGS += "-no-xinerama -no-xkb"
14QT_BASE_NAME ?= "qt4" 14QT_BASE_NAME ?= "qt4"
15QT_BASE_LIB ?= "libqt" 15QT_BASE_LIB ?= "libqt"
16 16