aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-x11-free.inc
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-08-11 23:25:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-15 15:13:34 +0100
commit49c43e2bea64f70a22a2741ea280bd1c13e5110a (patch)
tree26d5fe4a2e6a4c5ecc725c9fc4c769f8e9711821 /meta/recipes-qt/qt4/qt4-x11-free.inc
parent11f456f4f5c1d4b2aad93856ff6cbb4d7ce3969e (diff)
downloadopenembedded-core-contrib-49c43e2bea64f70a22a2741ea280bd1c13e5110a.tar.gz
qt4: package QML plugins and correct their install directory
QML components from Qt were installed to ${prefix} before and never got packaged. This is now fixed and QML components are now installed into ${libdir}/${QT_DIR_NAME}/imports and packaged into qt4-*-qml-plugins package. Additionally qmlviewer and the examples/demos are now dependent upon these plugins as needed. Originally based on OE commit 4adf97be8c5b5f71ad92095a19968af534baa9e2 by Simon Busch <morphis@gravedo.de> 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.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index b8633de741..234cb8973c 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r25"
+INC_PR = "r26"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"