Changeset 6280464 in sasview for src/sas/qtgui/Utilities/IPythonWidget.py

Timestamp:

Nov 3, 2017 10:58:39 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

412e069e

Parents:

304d082

Message:

More Qt5 related fixes.

File:

• src/sas/qtgui/Utilities/IPythonWidget.py (modified) (2 diffs)

src/sas/qtgui/Utilities/IPythonWidget.py

@@ -3 +3 @@
 from PyQt5 import QtWidgets
 
-##from PyQt4 import QtSvg
+from PyQt5 import QtSvg
 
 def new_load_qt(api_options):
@@ -18 +18 @@
 # Do some monkey patching to satisfy pyinstaller complaining
 # about pyside/pyqt confusion
-qt_loaders.load_qt = new_load_qt
-qtconsole_qt_loaders.load_qt = qtconsole_new_load_qt
+#qt_loaders.load_qt = new_load_qt
+#qtconsole_qt_loaders.load_qt = qtconsole_new_load_qt
 
 from qtconsole.rich_jupyter_widget import RichJupyterWidget