diff options
| author | Florian Bruhin <me@the-compiler.org> | 2022-05-30 19:42:40 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2022-06-22 17:41:12 +0200 |
| commit | f5397b3d6712f2f95cf372fd603e9d6c0795d961 (patch) | |
| tree | 9caf1ee60e8560010d822c3530575ca20a287a69 | |
| parent | e5a6408aaa75c38ad5c7c4a138e7b8b2867f0d19 (diff) | |
| download | qutebrowser-f5397b3d6712f2f95cf372fd603e9d6c0795d961.tar.gz qutebrowser-f5397b3d6712f2f95cf372fd603e9d6c0795d961.zip | |
old qt: Remove workaround
Fixed in sip 5.3.0 (May 31st, 2020), so should not be a problem
since Qt 5.15.0 (June 1st, 2020).
| -rw-r--r-- | qutebrowser/browser/webengine/notification.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/qutebrowser/browser/webengine/notification.py b/qutebrowser/browser/webengine/notification.py index 2e4bb1e62..88f889da3 100644 --- a/qutebrowser/browser/webengine/notification.py +++ b/qutebrowser/browser/webengine/notification.py @@ -1078,15 +1078,7 @@ class DBusNotificationAdapter(AbstractNotificationAdapter): image_data.add(bits_per_color) image_data.add(channel_count) - try: - size = qimage.sizeInBytes() - except TypeError: - # WORKAROUND for - # https://www.riverbankcomputing.com/pipermail/pyqt/2020-May/042919.html - # byteCount() is obsolete, but sizeInBytes() is only available with - # SIP >= 5.3.0. - # FIXME:qt6 What PyQt version does this correspond to? - size = qimage.byteCount() + size = qimage.sizeInBytes() # Despite the spec not mandating this, many notification daemons mandate that # the last scanline does not have any padding bytes. |