|
49 | 49 | # user has imported PySide before importing mpl
|
50 | 50 | QT_API = QT_API_PYSIDE
|
51 | 51 |
|
| 52 | +if 'PySide2' in sys.modules: |
| 53 | + # user has imported PySide before importing mpl |
| 54 | + QT_API = QT_API_PYSIDE2 |
| 55 | + |
52 | 56 | if 'PyQt4' in sys.modules:
|
53 | 57 | # user has imported PyQt4 before importing mpl
|
54 | 58 | # this case also handles the PyQt4v2 case as once sip is imported
|
|
65 | 69 | except KeyError:
|
66 | 70 | raise RuntimeError(
|
67 | 71 | ('Unrecognized environment variable %r, valid values are:'
|
68 |
| - ' %r, %r or %r' % (QT_API_ENV, 'pyqt', 'pyside', 'pyqt5'))) |
| 72 | + ' %r, %r, %r or %r' |
| 73 | + % (QT_API_ENV, 'pyqt', 'pyside', 'pyqt5', 'pyside2'))) |
69 | 74 | if QT_ENV_MAJOR_VERSION == QT_RC_MAJOR_VERSION:
|
70 | 75 | # Only if backend and env qt major version are
|
71 | 76 | # compatible use the env variable.
|
|
99 | 104 | _sip_imported = True
|
100 | 105 | except ImportError:
|
101 | 106 | # Try using PySide
|
102 |
| - QT_API = QT_API_PYSIDE |
| 107 | + if QT_RC_MAJOR_VERSION == 5: |
| 108 | + QT_API = QT_API_PYSIDE2 |
| 109 | + else: |
| 110 | + QT_API = QT_API_PYSIDE |
103 | 111 | cond = ("Could not import sip; falling back on PySide\n"
|
104 | 112 | "in place of PyQt4 or PyQt5.\n")
|
105 | 113 | verbose.report(cond, 'helpful')
|
@@ -166,7 +174,10 @@ def _getSaveFileName(*args, **kwargs):
|
166 | 174 | __version__ = QtCore.PYQT_VERSION_STR
|
167 | 175 | except NameError:
|
168 | 176 | # QtCore did not get imported, fall back to pyside
|
169 |
| - QT_API = QT_API_PYSIDE |
| 177 | + if QT_RC_MAJOR_VERSION == 5: |
| 178 | + QT_API = QT_API_PYSIDE2 |
| 179 | + else: |
| 180 | + QT_API = QT_API_PYSIDE |
170 | 181 |
|
171 | 182 |
|
172 | 183 | if QT_API == QT_API_PYSIDE2:
|
|
0 commit comments