summaryrefslogtreecommitdiff
path: root/debian/patches/0006-prefer-pyqt5-over-pyside.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0006-prefer-pyqt5-over-pyside.patch')
-rw-r--r--debian/patches/0006-prefer-pyqt5-over-pyside.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/debian/patches/0006-prefer-pyqt5-over-pyside.patch b/debian/patches/0006-prefer-pyqt5-over-pyside.patch
deleted file mode 100644
index 253751b..0000000
--- a/debian/patches/0006-prefer-pyqt5-over-pyside.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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'
-