qt_pixmap_thread_test(): Simplify logic, merge warnings

Pick-to: 6.2
Change-Id: I0c413c14d124bafbd6b2bd94d7a128e19ed83ade
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

1 files changed, 6 insertions, 12 deletions

diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index b1be8ff408..7748ae8285 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -81,17 +81,11 @@ static bool qt_pixmap_thread_test()
         qFatal("QPixmap: Must construct a QGuiApplication before a QPixmap");
         return false;
     }
-
-    if (QGuiApplicationPrivate::instance() && qApp->thread() != QThread::currentThread()) {
-        bool fail = false;
-        if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedPixmaps)) {
-            printf("Platform plugin does not support threaded pixmaps!\n");
-            fail = true;
-        }
-        if (fail) {
-            qWarning("QPixmap: It is not safe to use pixmaps outside the GUI thread");
-            return false;
-        }
+    if (QGuiApplicationPrivate::instance()
+        && qApp->thread() != QThread::currentThread()
+        && !QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedPixmaps)) {
+        qWarning("QPixmap: It is not safe to use pixmaps outside the GUI thread on this platform");
+        return false;
     }
     return true;
 }