summarylogtreecommitdiffstats
path: root/pyqt4_qstring_fix.patch
blob: bd04bb47cf4a77abcf93dcb7dfbf15f40074371b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
diff -ura src/fabio-0.4.0/scripts/fabio_viewer src_new/fabio-0.4.0/scripts/fabio_viewer
--- src/fabio-0.4.0/scripts/fabio_viewer	2016-07-15 05:00:21.000000000 -0400
+++ src_new/fabio-0.4.0/scripts/fabio_viewer	2017-04-03 22:30:59.606912706 -0400
@@ -22,7 +22,12 @@
 import os
 import time
 
-from PyQt4.QtCore import QDir, Qt, QRect, QString, QCoreApplication
+from PyQt4.QtCore import QDir, Qt, QRect, QCoreApplication
+try:
+    from PyQt4.QtCore import QString
+except ImportError:
+    QString = str
+
 from PyQt4.QtGui import QLabel, QVBoxLayout, QWidget, QSplitter, QListWidget, \
                         QComboBox, QApplication, QStyleFactory, QHBoxLayout, \
                         QTabWidget, QPlainTextEdit, QPushButton, QGroupBox, \