Annotation of /trunk/pyqt4/patches/pyqt4-4.7.7-fix-scpk-and-flags.patch
Parent Directory | Revision Log
Revision 1169 -
(hide annotations)
(download)
Mon Oct 11 19:05:55 2010 UTC (13 years, 11 months ago) by niro
File size: 1490 byte(s)
Mon Oct 11 19:05:55 2010 UTC (13 years, 11 months ago) by niro
File size: 1490 byte(s)
upstream patch to fix kdebindings4-4.5.1-python compilation
1 | niro | 1169 | Index: PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py |
2 | =================================================================== | ||
3 | --- PyQt-x11-gpl-4.7.7.orig/pyuic/uic/Loader/loader.py | ||
4 | +++ PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py | ||
5 | @@ -1,3 +1,5 @@ | ||
6 | +import os.path | ||
7 | + | ||
8 | from PyQt4 import QtGui, QtCore | ||
9 | from PyQt4.uic.uiparser import UIParser | ||
10 | from PyQt4.uic.Loader.qobjectcreator import LoaderCreatorPolicy | ||
11 | @@ -19,6 +21,7 @@ class DynamicUILoader(UIParser): | ||
12 | def loadUi(self, filename, toplevelInst=None): | ||
13 | self.toplevelInst = toplevelInst | ||
14 | |||
15 | - # By using QFileInfo.path() rather than os.path.dirname() we allow | ||
16 | - # QString file names. | ||
17 | - return self.parse(filename, QtCore.QFileInfo(filename).path()) | ||
18 | + # Allow the filename to be a QString. | ||
19 | + filename = str(filename) | ||
20 | + | ||
21 | + return self.parse(filename, os.path.dirname(filename)) | ||
22 | Index: PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip | ||
23 | =================================================================== | ||
24 | --- PyQt-x11-gpl-4.7.7.orig/sip/QtCore/qglobal.sip | ||
25 | +++ PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip | ||
26 | @@ -312,12 +312,12 @@ public: | ||
27 | // Qt.Alignment class. | ||
28 | QFlags operator|(int f); | ||
29 | %MethodCode | ||
30 | - sipRes = new QFlags(*a0 | (ENUM(a1))); | ||
31 | + sipRes = new QFlags(*a0 | a1); | ||
32 | %End | ||
33 | |||
34 | QFlags operator^(int f); | ||
35 | %MethodCode | ||
36 | - sipRes = new QFlags(*a0 ^ (ENUM(a1))); | ||
37 | + sipRes = new QFlags(*a0 ^ a1); | ||
38 | %End | ||
39 | |||
40 | // These are necessary to prevent Python comparing object IDs. |