Move duplicate WindowActivation checks into a skip macro

Task-number: QTBUG-124230
Pick-to: 6.5 6.7
Change-Id: I617f851cd2b2b1a4f4c3dada2e4ebdf5c4be18fd
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Doris Verria <[email protected]>

1 files changed, 2 insertions, 8 deletions

diff --git a/tests/auto/quickcontrols/qquicktextarea/tst_qquicktextarea.cpp b/tests/auto/quickcontrols/qquicktextarea/tst_qquicktextarea.cpp
index a576bb7941..75e2550d7a 100644
--- a/tests/auto/quickcontrols/qquicktextarea/tst_qquicktextarea.cpp
+++ b/tests/auto/quickcontrols/qquicktextarea/tst_qquicktextarea.cpp
@@ -12,6 +12,7 @@
 #include <QtQuick/qquickview.h>
 #include <QtQuickTestUtils/private/qmlutils_p.h>
 #include <QtQuickTestUtils/private/viewtestutils_p.h>
+#include <QtQuickTestUtils/private/visualtestutils_p.h>
 #include <QtQuickTemplates2/private/qquicktextarea_p.h>
 #include <QtQuickControlsTestUtils/private/qtest_quickcontrols_p.h>
 
@@ -29,7 +30,6 @@ private slots:
     void touchscreenSetsFocusAndMovesCursor();
 
 private:
-    static bool hasWindowActivation();
     QScopedPointer<QPointingDevice> touchDevice = QScopedPointer<QPointingDevice>(QTest::createTouchDevice());
 };
 
@@ -102,8 +102,7 @@ void tst_QQuickTextArea::touchscreenDoesNotSelect()
 
 void tst_QQuickTextArea::touchscreenSetsFocusAndMovesCursor()
 {
-    if (!hasWindowActivation())
-        QSKIP("Window activation is not supported");
+    SKIP_IF_NO_WINDOW_ACTIVATION
     qunsetenv("QT_QUICK_CONTROLS_TEXT_SELECTION_BEHAVIOR");
 
     QQuickView window;
@@ -158,11 +157,6 @@ void tst_QQuickTextArea::touchscreenSetsFocusAndMovesCursor()
     QCOMPARE_GT(top->selectedText().size(), 0);
 }
 
-bool tst_QQuickTextArea::hasWindowActivation()
-{
-    return (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation));
-}
-
 QTEST_QUICKCONTROLS_MAIN(tst_QQuickTextArea)
 
 #include "tst_qquicktextarea.moc"