blob: 38083e76e5232c454d6956ddd7dd5dfd52e130c2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Index: PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py
===================================================================
--- PyQt-x11-gpl-4.7.7.orig/pyuic/uic/Loader/loader.py
+++ PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py
@@ -1,3 +1,5 @@
+import os.path
+
from PyQt4 import QtGui, QtCore
from PyQt4.uic.uiparser import UIParser
from PyQt4.uic.Loader.qobjectcreator import LoaderCreatorPolicy
@@ -19,6 +21,7 @@ class DynamicUILoader(UIParser):
def loadUi(self, filename, toplevelInst=None):
self.toplevelInst = toplevelInst
- # By using QFileInfo.path() rather than os.path.dirname() we allow
- # QString file names.
- return self.parse(filename, QtCore.QFileInfo(filename).path())
+ # Allow the filename to be a QString.
+ filename = str(filename)
+
+ return self.parse(filename, os.path.dirname(filename))
Index: PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip
===================================================================
--- PyQt-x11-gpl-4.7.7.orig/sip/QtCore/qglobal.sip
+++ PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip
@@ -312,12 +312,12 @@ public:
// Qt.Alignment class.
QFlags operator|(int f);
%MethodCode
- sipRes = new QFlags(*a0 | (ENUM(a1)));
+ sipRes = new QFlags(*a0 | a1);
%End
QFlags operator^(int f);
%MethodCode
- sipRes = new QFlags(*a0 ^ (ENUM(a1)));
+ sipRes = new QFlags(*a0 ^ a1);
%End
// These are necessary to prevent Python comparing object IDs.
|
