Attachment 54150 Details for Bug 40298 – "Allow using QPixmap outside GUI thread when using raster"

[patch] "Allow using QPixmap outside GUI thread when using raster"

qpixmap-outside-guithread.patch (text/plain), 1.24 KB, created by Rafael da Veiga Cabral on 2011-12-06 08:43:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafael da Veiga Cabral

Created: 2011-12-06 08:43:52 UTC

Size: 1.24 KB

patch

obsolete

>commit b67d537070e88feb708d13b46cd1468e2c0dc0e8
>Author: Gunnar Sletta <gunnar.sletta@nokia.com>
>Date:   Thu Feb 10 16:10:57 2011 +1000
>
>    Allow using QPixmap outside GUI thread when using raster
>
>diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
>index f896572..b276180 100644
>--- a/src/gui/image/qpixmap.cpp
>+++ b/src/gui/image/qpixmap.cpp
>@@ -98,12 +98,21 @@ static bool qt_pixmap_thread_test()
>         qFatal("QPixmap: Must construct a QApplication before a QPaintDevice");
>         return false;
>     }
>-#ifndef Q_WS_WIN
>-    if (!QApplication::testAttribute(Qt::AA_X11InitThreads) && qApp->thread() != QThread::currentThread()) {
>-        qWarning("QPixmap: It is not safe to use pixmaps outside the GUI thread");
>-        return false;
>-    }
>+
>+    if (qApp->thread() != QThread::currentThread()) {
>+        bool fail = false;
>+#if defined (Q_WS_X11)
>+        if (!QApplication::testAttribute(Qt::AA_X11InitThreads))
>+            fail = true;
>+#else
>+        if (QApplicationPrivate::graphics_system_name != QLatin1String("raster"))
>+            fail = true;
> #endif
>+        if (fail) {
>+            qWarning("QPixmap: It is not safe to use pixmaps outside the GUI thread");
>+            return false;
>+        }
>+    }
>     return true;
> }
>

Actions: View

Attachments on bug 40298: 50464 | 50465 | 53777 | 54150 | 54194