From c4d651a902d0ee289976bfa3ecc69a85dfe11da2 2012-05-08 01:21:30
From: Min RK <benjaminrk@gmail.com>
Date: 2012-05-08 01:21:30
Subject: [PATCH] Merge pull request #1704 from juliantaylor/ensure-qt-imports

ensure all needed qt parts can be imported before settling for one

required as qt installations can be incomplete in some distributions
---

diff --git a/IPython/external/qt.py b/IPython/external/qt.py
index 553123e..0c05e33 100644
--- a/IPython/external/qt.py
+++ b/IPython/external/qt.py
@@ -28,12 +28,13 @@ if QT_API is None:
         if PySide.__version__ < '1.0.3':
             # old PySide, fallback on PyQt
             raise ImportError
+        from PySide import QtCore, QtGui, QtSvg
         QT_API = QT_API_PYSIDE
     except ImportError:
         try:
             prepare_pyqt4()
             import PyQt4
-            from PyQt4 import QtCore
+            from PyQt4 import QtCore, QtGui, QtSvg
             if QtCore.PYQT_VERSION_STR < '4.7':
                 # PyQt 4.6 has issues with null strings returning as None
                 raise ImportError