@@ -436,6 +436,12 @@ def set_qt_api(gui, kernel):
436436 """Sets the `QT_API` environment variable if it isn't already set."""
437437 if hasattr (kernel , 'app' ):
438438 raise RuntimeError ('Kernel already running a Qt event loop.' )
439+
440+ if gui != 'qt' and hasattr (kernel , 'last_qt_version' ):
441+ if kernel .last_qt_version != gui :
442+ raise ValueError ('Cannot switch Qt versions for this session; '
443+ f'must use { kernel .last_qt_version } .' )
444+
439445 qt_api = os .environ .get ("QT_API" , None )
440446 if qt_api is not None and gui != 'qt' :
441447 env2gui = {'pyside' : 'qt4' ,
@@ -493,11 +499,6 @@ def set_qt_api(gui, kernel):
493499 else :
494500 raise ValueError (f'Unrecognized Qt version: { gui } . Should be "qt4", "qt5", "qt6", or "qt".' )
495501
496- if gui != 'qt' and hasattr (kernel , 'last_qt_version' ) and 'QT_API' in os .environ .keys ():
497- if kernel .last_qt_version != gui :
498- raise ValueError ('Cannot switch Qt versions for this session; '
499- f'must use { kernel .last_qt_version } .' )
500-
501502 # Do the actual import now that the environment variable is set.
502503 try :
503504 from IPython .external .qt_for_kernel import QtGui , QtCore , QT_API
0 commit comments