2 files changed, 17 insertions, 10 deletions
diff --git a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
index bbe8652e99..e3ce0774bc 100644
--- a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Generated from qinputmethod.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qinputmethod Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qinputmethod LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qinputmethod
     SOURCES
         tst_qinputmethod.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
         Qt::Gui
         Qt::GuiPrivate
diff --git a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
index 86669fde62..619de7bed3 100644
--- a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
+++ b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #include <QSignalSpy>
@@ -125,7 +125,7 @@ void tst_qinputmethod::animating()
 
     QSignalSpy spy(qApp->inputMethod(), SIGNAL(animatingChanged()));
     m_platformInputContext.emitAnimatingChanged();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 void tst_qinputmethod::keyboarRectangle()
@@ -137,7 +137,7 @@ void tst_qinputmethod::keyboarRectangle()
 
     QSignalSpy spy(qApp->inputMethod(), SIGNAL(keyboardRectangleChanged()));
     m_platformInputContext.emitKeyboardRectChanged();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 void tst_qinputmethod::inputItemTransform()
@@ -152,7 +152,7 @@ void tst_qinputmethod::inputItemTransform()
     qApp->inputMethod()->setInputItemTransform(transform);
 
     QCOMPARE(qApp->inputMethod()->inputItemTransform(), transform);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     // reset
     qApp->inputMethod()->setInputItemTransform(QTransform());
@@ -249,13 +249,13 @@ void tst_qinputmethod::query()
 
 void tst_qinputmethod::inputDirection()
 {
-    QCOMPARE(m_platformInputContext.m_inputDirectionCallCount, 0);
+    auto originalCount = m_platformInputContext.m_inputDirectionCallCount;
     qApp->inputMethod()->inputDirection();
-    QCOMPARE(m_platformInputContext.m_inputDirectionCallCount, 1);
+    QCOMPARE(m_platformInputContext.m_inputDirectionCallCount, originalCount + 1);
 
-    QCOMPARE(m_platformInputContext.m_localeCallCount, 0);
+    originalCount = m_platformInputContext.m_localeCallCount;
     qApp->inputMethod()->locale();
-    QCOMPARE(m_platformInputContext.m_localeCallCount, 1);
+    QCOMPARE(m_platformInputContext.m_localeCallCount, originalCount + 1);
 }
 
 void tst_qinputmethod::inputMethodAccepted()