diff options
Diffstat (limited to 'libre/calibre/incompatibility-pyqt5.4.1.patch')
| -rw-r--r-- | libre/calibre/incompatibility-pyqt5.4.1.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/libre/calibre/incompatibility-pyqt5.4.1.patch b/libre/calibre/incompatibility-pyqt5.4.1.patch new file mode 100644 index 000000000..e2f44e19e --- /dev/null +++ b/libre/calibre/incompatibility-pyqt5.4.1.patch @@ -0,0 +1,28 @@ +From 72d47ba9377d70e786bf3d93b323544188c894bd Mon Sep 17 00:00:00 2001 +From: Kovid Goyal <kovid@kovidgoyal.net> +Date: Thu, 5 Mar 2015 07:50:28 +0530 +Subject: [PATCH] =?UTF-8?q?Fix=20incompatibility=20with=20PyQt=205.4.1.=20?= + =?UTF-8?q?Fixes=20#1427684=20["TypeError:=20QPixmap():=20argument=201=20h?= + =?UTF-8?q?as=20unexpected=20type"=20=E2=80=93=20incompatibility=20with=20?= + =?UTF-8?q?Qt=205.4.1=3F](https://bugs.launchpad.net/calibre/+bug/1427684)?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + src/calibre/gui2/widgets.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py +index 0e84267..ed40a97 100644 +--- a/src/calibre/gui2/widgets.py ++++ b/src/calibre/gui2/widgets.py +@@ -295,7 +295,7 @@ class ImageView(QWidget, ImageDropMixin): # {{{ + def __init__(self, parent=None, show_size_pref_name=None, default_show_size=False): + QWidget.__init__(self, parent) + self.show_size_pref_name = ('show_size_on_cover_' + show_size_pref_name) if show_size_pref_name else None +- self._pixmap = QPixmap(self) ++ self._pixmap = QPixmap() + self.setMinimumSize(QSize(150, 200)) + ImageDropMixin.__init__(self) + self.draw_border = True |