2 files changed, 13 insertions, 6 deletions
diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
index f78e1d81c7..316b9cd3c6 100644
--- a/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
@@ -1,12 +1,19 @@
-# Generated from qabstracttextdocumentlayout.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qabstracttextdocumentlayout Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qabstracttextdocumentlayout LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qabstracttextdocumentlayout
     SOURCES
         tst_qabstracttextdocumentlayout.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Gui
 )
diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
index 4ab2d1adb3..2ae2ccda0a 100644
--- a/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.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>
@@ -126,7 +126,7 @@ void tst_QAbstractTextDocumentLayout::anchorAt()
     QAbstractTextDocumentLayout *documentLayout = doc.documentLayout();
     QTextBlock firstBlock = doc.begin();
     QTextLayout *layout = firstBlock.layout();
-    layout->setPreeditArea(doc.toPlainText().length(), "xxx");
+    layout->setPreeditArea(doc.toPlainText().size(), "xxx");
 
     doc.setPageSize(QSizeF(1000, 1000));
     QFontMetrics metrics(layout->font());
@@ -156,7 +156,7 @@ void tst_QAbstractTextDocumentLayout::imageAt()
     QAbstractTextDocumentLayout *documentLayout = doc.documentLayout();
     QTextBlock firstBlock = doc.begin();
     QTextLayout *layout = firstBlock.layout();
-    layout->setPreeditArea(doc.toPlainText().length(), "xxx");
+    layout->setPreeditArea(doc.toPlainText().size(), "xxx");
 
     doc.setPageSize(QSizeF(1000, 1000));
     QFontMetrics metrics(layout->font());
@@ -181,7 +181,7 @@ void tst_QAbstractTextDocumentLayout::formatAt()
     QAbstractTextDocumentLayout *documentLayout = doc.documentLayout();
     QTextBlock firstBlock = doc.begin();
     QTextLayout *layout = firstBlock.layout();
-    layout->setPreeditArea(doc.toPlainText().length(), "xxx");
+    layout->setPreeditArea(doc.toPlainText().size(), "xxx");
 
     doc.setPageSize(QSizeF(1000, 1000));
     QFontMetrics metrics(layout->font());