Merge pull request #6496 from userzimmermann/master

%gui qt5

IPython/core/magics/basic.py

@@ -525,6 +525,7 b' Defaulting color scheme to \'NoColor\'"""'
 
             %gui wx      # enable wxPython event loop integration
             %gui qt4|qt  # enable PyQt4 event loop integration
+            %gui qt5     # enable PyQt5 event loop integration
             %gui gtk     # enable PyGTK event loop integration
             %gui gtk3    # enable Gtk3 event loop integration
             %gui tk      # enable Tk event loop integration

IPython/lib/inputhook.py

@@ -369,6 +369,14 b' class Qt4InputHook(InputHookBase):'
         from IPython.external.appnope import nap
         nap()
 
+
+@inputhook_manager.register('qt5')
+class Qt5InputHook(Qt4InputHook):
+    def enable(self, app=None):
+        os.environ['QT_API'] = 'pyqt5'
+        return Qt4InputHook.enable(self, app)
+
+
 @inputhook_manager.register('gtk')
 class GtkInputHook(InputHookBase):
     def enable(self, app=None):