summaryrefslogtreecommitdiff
path: root/packages/python
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-12-14 15:58:09 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-12-14 15:58:09 +0000
commit0de74582bc1cda8dcea56c0d7a6504739056e34f (patch)
treefdf221cb486da599243a0d48f0deb275312080e0 /packages/python
parent84ef044e8283ba93d955f443b17d41d0ba164644 (diff)
parent1a43f7bfb4c74b60df85ef0d681fd24adc22fe26 (diff)
merge of '52aa2df47cf7bc30b6972165f60dd26369dd337c'
and '6a57ef3dc19b0640f6623b5aa686a5c2d3f81f32'
Diffstat (limited to 'packages/python')
-rw-r--r--packages/python/python-pyqt_4.3.3.bb (renamed from packages/python/python-pyqt_4.3.1.bb)3
-rw-r--r--packages/python/python-sip_4.7.3.bb (renamed from packages/python/python-sip_4.7.1.bb)0
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/python/python-pyqt_4.3.1.bb b/packages/python/python-pyqt_4.3.3.bb
index d9c45ec14c..74a16c4720 100644
--- a/packages/python/python-pyqt_4.3.1.bb
+++ b/packages/python/python-pyqt_4.3.3.bb
@@ -22,7 +22,8 @@ inherit qt4x11 sip distutils-base
PARALLEL_MAKE = ""
QMAKE_PROFILES = "pyqt.pro"
-EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
+# NOTE: match with qt version we have in OE
+EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
EXTRA_OEMAKE = " MAKEFLAGS= "
SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
diff --git a/packages/python/python-sip_4.7.1.bb b/packages/python/python-sip_4.7.3.bb
index fc87b01e53..fc87b01e53 100644
--- a/packages/python/python-sip_4.7.1.bb
+++ b/packages/python/python-sip_4.7.3.bb