##// END OF EJS Templates
Merge pull request #1704 from juliantaylor/ensure-qt-imports...
Min RK -
r6730:c4d651a9 merge
parent child Browse files
Show More
@@ -28,12 +28,13 b' if QT_API is None:'
28 if PySide.__version__ < '1.0.3':
28 if PySide.__version__ < '1.0.3':
29 # old PySide, fallback on PyQt
29 # old PySide, fallback on PyQt
30 raise ImportError
30 raise ImportError
31 from PySide import QtCore, QtGui, QtSvg
31 QT_API = QT_API_PYSIDE
32 QT_API = QT_API_PYSIDE
32 except ImportError:
33 except ImportError:
33 try:
34 try:
34 prepare_pyqt4()
35 prepare_pyqt4()
35 import PyQt4
36 import PyQt4
36 from PyQt4 import QtCore
37 from PyQt4 import QtCore, QtGui, QtSvg
37 if QtCore.PYQT_VERSION_STR < '4.7':
38 if QtCore.PYQT_VERSION_STR < '4.7':
38 # PyQt 4.6 has issues with null strings returning as None
39 # PyQt 4.6 has issues with null strings returning as None
39 raise ImportError
40 raise ImportError
General Comments 0
You need to be logged in to leave comments. Login now