2 files changed, 15 insertions, 8 deletions
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
index 9ac732cee0..f1c9146ce1 100644
--- a/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
+++ b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Generated from qsyntaxhighlighter.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qsyntaxhighlighter Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qsyntaxhighlighter LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qsyntaxhighlighter
     SOURCES
         tst_qsyntaxhighlighter.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Gui
 )
 
@@ -15,6 +22,6 @@ qt_internal_add_test(tst_qsyntaxhighlighter
 #####################################################################
 
 qt_internal_extend_target(tst_qsyntaxhighlighter CONDITION TARGET Qt::Widgets
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Widgets
 )
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
index 202d07ea1e..748f494a41 100644
--- a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
+++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.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>
@@ -100,7 +100,7 @@ public:
 
             virtual void highlightBlock(const QString &text) override
             {
-                for (int i = 0; i < formats.count(); ++i) {
+                for (int i = 0; i < formats.size(); ++i) {
                     const QTextLayout::FormatRange &range = formats.at(i);
                     setFormat(range.start, range.length, range.format);
                 }
@@ -161,7 +161,7 @@ public:
             commentFormat.setForeground(Qt::darkGreen);
             commentFormat.setFontWeight(QFont::StyleItalic);
             commentFormat.setFontFixedPitch(true);
-            int textLength = text.length();
+            int textLength = text.size();
 
             if (text.startsWith(QLatin1Char(';'))){
                 // The entire line is a comment
@@ -414,7 +414,7 @@ void tst_QSyntaxHighlighter::preservePreeditArea()
     QCOMPARE(hl->callCount, 1);
 
     formats = layout->formats();
-    QCOMPARE(formats.count(), 3);
+    QCOMPARE(formats.size(), 3);
 
     range = formats.at(0);
 
@@ -493,7 +493,7 @@ void tst_QSyntaxHighlighter::noContentsChangedDuringHighlight()
     QSignalSpy contentsChangedSpy(doc, SIGNAL(contentsChanged()));
     cursor.insertText("Hello World");
 
-    QCOMPARE(contentsChangedSpy.count(), 1);
+    QCOMPARE(contentsChangedSpy.size(), 1);
     QVERIFY(hl->highlighted);
     QVERIFY(lout->documentChangedCalled);
 }