blob: 253751ba8b8a8ba785369bb2b39d4f2eb9b864b2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
<picca@synchrotron-soleil.fr>
Date: Mon, 14 Aug 2017 14:58:02 +0200
Subject: prefer pyqt5 over pyside
---
silx/gui/qt/_qt.py | 16 ++++++++--------
1 file 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'
|
