diff options
author | Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr> | 2017-08-14 14:58:02 +0200 |
---|---|---|
committer | Picca Frédéric-Emmanuel <picca@debian.org> | 2017-11-25 17:02:19 +0100 |
commit | 3e0df6c25f113f8c57c202d8edd0d1451acbfb5c (patch) | |
tree | bb828afbd96f35a3ade5d949a6bf85f897e2e366 | |
parent | 0fbb2555d5ec11cbcbcfd465633ecfee7922c908 (diff) |
prefer pyqt5 over pyside
Gbp-Pq: Name 0006-prefer-pyqt5-over-pyside.patch
-rw-r--r-- | silx/gui/qt/_qt.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/silx/gui/qt/_qt.py b/silx/gui/qt/_qt.py index 0962c21..67f3e46 100644 --- a/silx/gui/qt/_qt.py +++ b/silx/gui/qt/_qt.py @@ -64,12 +64,12 @@ HAS_OPENGL = False """True if Qt provides support for OpenGL (QtOpenGL).""" # First check for an already loaded wrapper -if 'PySide.QtCore' in sys.modules: - BINDING = 'PySide' - -elif 'PyQt5.QtCore' in sys.modules: +if 'PyQt5.QtCore' in sys.modules: BINDING = 'PyQt5' +elif 'PySide.QtCore' in sys.modules: + BINDING = 'PySide' + elif 'PyQt4.QtCore' in sys.modules: BINDING = 'PyQt4' @@ -78,17 +78,17 @@ else: # Then try Qt bindings import PyQt4 # noqa except ImportError: try: - import PySide # noqa + import PyQt5 # noqa except ImportError: try: - import PyQt5 # noqa + import PySide # noqa except ImportError: raise ImportError( 'No Qt wrapper found. Install PyQt4, PyQt5 or PySide.') else: - BINDING = 'PyQt5' + BINDING = 'PySide' else: - BINDING = 'PySide' + BINDING = 'PyQt5' else: BINDING = 'PyQt4' |