##// END OF EJS Templates
Fix Qt loader commit_api() for 'pyqtv1' or 'pyqtdefault'...
Thomas Kluyver -
Show More
@@ -57,11 +57,11 b' def commit_api(api):'
57 57 if api == QT_API_PYSIDE:
58 58 ID.forbid('PyQt4')
59 59 ID.forbid('PyQt5')
60 elif api == QT_API_PYQT:
60 elif api == QT_API_PYQT5:
61 61 ID.forbid('PySide')
62 ID.forbid('PyQt5')
63 else:
64 62 ID.forbid('PyQt4')
63 else: # There are three other possibilities, all representing PyQt4
64 ID.forbid('PyQt5')
65 65 ID.forbid('PySide')
66 66
67 67
@@ -241,7 +241,7 b' def load_qt(api_options):'
241 241 ----------
242 242 api_options: List of strings
243 243 The order of APIs to try. Valid items are 'pyside',
244 'pyqt', 'pyqt5' and 'pyqtv1'
244 'pyqt', 'pyqt5', 'pyqtv1' and 'pyqtdefault'
245 245
246 246 Returns
247 247 -------
General Comments 0
You need to be logged in to leave comments. Login now