[oe-commits] Simon Busch : python-pyside: prepare for x11 variant

[git version control]

Module: openembedded.git
Branch: master
Commit: d452617cc14fde92d8766d0392269c8a52adefb1
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=d452617cc14fde92d8766d0392269c8a52adefb1

Author: Simon Busch <morphis at gravedo.de>
Date:   Mon May 16 10:04:23 2011 +0200

python-pyside: prepare for x11 variant

Signed-off-by: Simon Busch <morphis at gravedo.de>

---

 recipes/pyside/python-pyside-embedded_1.0.2.bb |    3 ++-
 recipes/pyside/python-pyside.inc               |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes/pyside/python-pyside-embedded_1.0.2.bb b/recipes/pyside/python-pyside-embedded_1.0.2.bb
index 97875e2..3566799 100644
--- a/recipes/pyside/python-pyside-embedded_1.0.2.bb
+++ b/recipes/pyside/python-pyside-embedded_1.0.2.bb
@@ -1,6 +1,7 @@
+inherit qt4e
 require python-pyside.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 SRC_URI += " \
  file://no-accessibility-support.patch \
  file://support-qws.patch \
diff --git a/recipes/pyside/python-pyside.inc b/recipes/pyside/python-pyside.inc
index 1afd8d1..bc5d334 100644
--- a/recipes/pyside/python-pyside.inc
+++ b/recipes/pyside/python-pyside.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "Python Bindings for Qt ${QTV}"
 DEPENDS = "apiextractor-native generatorrunner-native shiboken-native libshiboken"
 RDEPENDS_${pn} = "python-core"
 PROVIDES = "python-pyside"
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = " \
  http://www.pyside.org/files/pyside-qt${QTV}+${PV}.tar.bz2;name=code \
@@ -20,7 +20,7 @@ export HOST_SYS
 export BUILD_SYS
 
 # NOTE this should be reworked when a x11 version of qt4 is needed
-inherit qt4e cmake pkgconfig python-dir
+inherit cmake pkgconfig python-dir
 
 EXTRA_OECMAKE = " \
 	-DQT_LIBRARY_DIR=${STAGING_TARGET_LIBDIR} \