Merge pull request #2214 from blink1073/fix-sphinxify-for-anaconda-34

- Fix wrong import statements in our Qt shim - This in turn fixes a segmentation fault in Anaconda 3.4 on Linux
spyder-ide · Mar 1, 2015 · e9007f5 · e9007f5
2 parents d91a322 + 8159291
commit e9007f5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/spyderlib/qt/QtCore.py b/spyderlib/qt/QtCore.py
@@ -15,8 +15,8 @@
     from PyQt5.QtCore import QT_VERSION_STR as __version__
 elif os.environ['QT_API'] == 'pyqt':
     from PyQt4.QtCore import *                                # analysis:ignore
-    from PyQt4.Qt import QCoreApplication                     # analysis:ignore
-    from PyQt4.Qt import Qt                                   # analysis:ignore
+    from PyQt4.QtCore import QCoreApplication                 # analysis:ignore
+    from PyQt4.QtCore import Qt                               # analysis:ignore
     from PyQt4.QtCore import pyqtSignal as Signal             # analysis:ignore
     from PyQt4.QtCore import pyqtSlot as Slot                 # analysis:ignore
     from PyQt4.QtCore import pyqtProperty as Property         # analysis:ignore