1 files changed, 6 insertions, 13 deletions
diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 5e2d49afb8..c944406e10 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -5,6 +5,7 @@
 #include <QtQuickTestUtils/private/qmlutils_p.h>
 #include <QtQuickTestUtils/private/testhttpserver_p.h>
 #include <QtQuickTestUtils/private/viewtestutils_p.h>
+#include <QtQuickTestUtils/private/visualtestutils_p.h>
 #include <private/qinputmethod_p.h>
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcomponent.h>
@@ -212,7 +213,6 @@ private:
 #if QT_CONFIG(shortcut)
     void simulateKeys(QWindow *window, const QKeySequence &sequence);
 #endif
-    static bool hasWindowActivation();
 
     QQmlEngine engine;
     QStringList standard;
@@ -238,11 +238,6 @@ void tst_qquicktextinput::simulateKeys(QWindow *window, const QList<Key> &keys)
     }
 }
 
-bool tst_qquicktextinput::hasWindowActivation()
-{
-    return (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation));
-}
-
 #if QT_CONFIG(shortcut)
 
 void tst_qquicktextinput::simulateKeys(QWindow *window, const QKeySequence &sequence)
@@ -7191,17 +7186,15 @@ void tst_qquicktextinput::touchscreenDoesNotSelect()
     QTest::touchEvent(&window, touchscreen.data()).press(0, QPoint(x2,y), &window);
     QTest::touchEvent(&window, touchscreen.data()).release(0, QPoint(x2,y), &window);
     QQuickTouchUtils::flush(&window);
-    QCOMPARE(textInputObject->selectedText().isEmpty(), !expectDefaultSelectByMouse);
-    if (expectDefaultSelectByMouse)
-        QCOMPARE(textInputObject->cursorPosition(), cursorPos);
-    else
-        QCOMPARE_NE(textInputObject->cursorPosition(), cursorPos);
+    QCOMPARE(textInputObject->selectedText().isEmpty(), true);
+    QCOMPARE_NE(textInputObject->cursorPosition(), cursorPos);
+    QVERIFY(textInputObject->selectedText().isEmpty());
 }
 
 void tst_qquicktextinput::touchscreenSetsFocusAndMovesCursor()
 {
-    if (!hasWindowActivation())
-        QSKIP("Window activation is not supported");
+    SKIP_IF_NO_WINDOW_ACTIVATION
+
     QQuickView window;
     QVERIFY(QQuickTest::showView(window, testFileUrl("twoInAColumn.qml")));
     window.requestActivate();