2 files changed, 8 insertions, 2 deletions
diff --git a/src/quicktestutils/quick/visualtestutils.cpp b/src/quicktestutils/quick/visualtestutils.cpp
index 30b6bf1135..c5e41f33f1 100644
--- a/src/quicktestutils/quick/visualtestutils.cpp
+++ b/src/quicktestutils/quick/visualtestutils.cpp
@@ -159,8 +159,8 @@ bool QQuickVisualTestUtils::compareImages(const QImage &ia, const QImage &ib, QS
             // No tolerance for error in the alpha.
             if ((a & 0xff000000) != (b & 0xff000000)
                 || qAbs(qRed(a) - qRed(b)) > tolerance
-                || qAbs(qRed(a) - qRed(b)) > tolerance
-                || qAbs(qRed(a) - qRed(b)) > tolerance) {
+                || qAbs(qGreen(a) - qGreen(b)) > tolerance
+                || qAbs(qBlue(a) - qBlue(b)) > tolerance) {
                 QDebug(errorMessage) << "Mismatch at:" << x << y << ':'
                     << Qt::hex << Qt::showbase << a << b;
                 return false;
diff --git a/src/quicktestutils/quick/visualtestutils_p.h b/src/quicktestutils/quick/visualtestutils_p.h
index 60837d8f65..24b3bebef0 100644
--- a/src/quicktestutils/quick/visualtestutils_p.h
+++ b/src/quicktestutils/quick/visualtestutils_p.h
@@ -15,6 +15,8 @@
 // We mean it.
 //
 
+#include <QtGui/private/qguiapplication_p.h>
+#include <QtGui/qpa/qplatformintegration.h>
 #include <QtQml/qqmlexpression.h>
 #include <QtQuick/private/qquickitem_p.h>
 
@@ -224,6 +226,10 @@ namespace QQuickVisualTestUtils
 #define QQUICK_VERIFY_POLISH(item) \
     QTRY_COMPARE(QQuickItemPrivate::get(item)->polishScheduled, false)
 
+#define SKIP_IF_NO_WINDOW_ACTIVATION \
+if (!(QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))) \
+    QSKIP("Window activation is not supported on this platform");
+
 QT_END_NAMESPACE
 
 #endif // QQUICKVISUALTESTUTILS_P_H