From 51f092905a2cb38feb5fef759b5ac8b417df0996 Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Fri, 11 Oct 2019 15:19:45 +0200
Subject: QTest: fall back to qWaitForWindowExposed in qWaitForWindowActivated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

...if window activation isn't supported.

Task-number: QTBUG-62188
Change-Id: Ia83de59d9a755d95b7150eb5261bc43dd7b60588
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/gui/kernel/qtestsupport_gui.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src/gui/kernel')

diff --git a/src/gui/kernel/qtestsupport_gui.cpp b/src/gui/kernel/qtestsupport_gui.cpp
index 7aad4d8c7d..79da26f2ca 100644
--- a/src/gui/kernel/qtestsupport_gui.cpp
+++ b/src/gui/kernel/qtestsupport_gui.cpp
@@ -37,10 +37,15 @@
 **
 ****************************************************************************/
 
+#include <private/qguiapplication_p.h>
+
+#include <qpa/qplatformintegration.h>
+
 #include "qtestsupport_gui.h"
 #include "qwindow.h"
 
 #include <QtCore/qtestsupport_core.h>
+#include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
 
@@ -55,6 +60,14 @@ QT_BEGIN_NAMESPACE
 */
 Q_GUI_EXPORT bool QTest::qWaitForWindowActive(QWindow *window, int timeout)
 {
+    if (Q_UNLIKELY(!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))) {
+        qWarning() << "qWaitForWindowActive was called on a platform that doesn't support window"
+                   << "activation. This means there is an error in the test and it should either"
+                   << "check for the WindowActivation platform capability before calling"
+                   << "qWaitForWindowActivate, use qWaitForWindowExposed instead, or skip the test."
+                   << "Falling back to qWaitForWindowExposed.";
+        return qWaitForWindowExposed(window, timeout);
+    }
     return QTest::qWaitFor([&]() { return window->isActive(); }, timeout);
 }
 
-- 
cgit v1.2.3