summaryrefslogtreecommitdiffstats
path: root/deps/qt/qt.fix.broken.gif.crash.diff
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-01-24 19:37:30 +0100
committer Eric Hameleers <alien@slackware.com>2015-01-24 19:37:30 +0100
commit03e1ed04d7a06d039e5dc317638aa5a6b4773f8c (patch)
tree71647cc408cc17d130c16f2527f59ff6cd58cf73 /deps/qt/qt.fix.broken.gif.crash.diff
parent63815cb3bce281c3f745f1da4ddc86f4ae4c1701 (diff)
downloadktown-03e1ed04d7a06d039e5dc317638aa5a6b4773f8c.tar.gz
ktown-03e1ed04d7a06d039e5dc317638aa5a6b4773f8c.tar.xz
Add support for Qt4 applications to dock to the Plasma 5 systray.
qt-4.8.6: added dep; compared to the Slackware original, I have applied several patches to impement qsystemtrayicon support. sni-qt: added dep; this application actually provides the systray support for Qt4 apps in Plasma 5.
Diffstat (limited to '')
-rw-r--r--deps/qt/qt.fix.broken.gif.crash.diff16
1 files changed, 16 insertions, 0 deletions
diff --git a/deps/qt/qt.fix.broken.gif.crash.diff b/deps/qt/qt.fix.broken.gif.crash.diff
new file mode 100644
index 0000000..7f74d71
--- /dev/null
+++ b/deps/qt/qt.fix.broken.gif.crash.diff
@@ -0,0 +1,16 @@
+--- ./src/gui/image/qgifhandler.cpp.orig 2014-04-10 13:37:12.000000000 -0500
++++ ./src/gui/image/qgifhandler.cpp 2014-04-25 13:42:48.468692269 -0500
+@@ -358,6 +358,13 @@
+ bits = image->bits();
+ memset(bits, 0, image->byteCount());
+ }
++
++ // Check if the previous attempt to create the image failed. If it
++ // did then the image is broken and we should give up.
++ if (image->isNull()) {
++ state = Error;
++ return -1;
++ }
+
+ disposePrevious(image);
+ disposed = false;