1 files changed, 15 insertions, 11 deletions
diff --git a/tests/auto/corelib/io/qdir/CMakeLists.txt b/tests/auto/corelib/io/qdir/CMakeLists.txt
index 49711da087..4032d7ac19 100644
--- a/tests/auto/corelib/io/qdir/CMakeLists.txt
+++ b/tests/auto/corelib/io/qdir/CMakeLists.txt
@@ -1,9 +1,16 @@
-# Generated from qdir.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qdir Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qdir LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 # Collect test data
 list(APPEND test_data "testdir")
 list(APPEND test_data "testData")
@@ -13,11 +20,12 @@ list(APPEND test_data "entrylist")
 list(APPEND test_data "types")
 list(APPEND test_data "tst_qdir.cpp")
 
-qt_add_test(tst_qdir
+qt_internal_add_test(tst_qdir
     SOURCES
         tst_qdir.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
+        Qt::TestPrivate
     TESTDATA ${test_data}
 )
 
@@ -26,26 +34,22 @@ set(qdir_resource_files
     "resources/entryList/"
 )
 
-qt_add_resource(tst_qdir "qdir"
+qt_internal_add_resource(tst_qdir "qdir"
     PREFIX
         "/tst_qdir/"
     FILES
         ${qdir_resource_files}
 )
 
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qdir.pro:IOS:
-# QMAKE_INFO_PLIST = "Info.plist"
-
-qt_extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata
+qt_internal_extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata
     DEFINES
         BUILTIN_TESTDATA
 )
 
-if(ANDROID AND NOT ANDROID_EMBEDDED)
+if(ANDROID)
     # Resources:
     set(android_testdata_resource_files
         "entrylist/directory/dummy"
@@ -90,7 +94,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED)
         "types/f/dummy"
     )
 
-    qt_add_resource(tst_qdir "android_testdata"
+    qt_internal_add_resource(tst_qdir "android_testdata"
         PREFIX
             "/android_testdata"
         FILES