5 files changed, 9 insertions, 11 deletions
diff --git a/tests/auto/tools/windeployqt/CMakeLists.txt b/tests/auto/tools/windeployqt/CMakeLists.txt
index 046859c6c6..9ac0051053 100644
--- a/tests/auto/tools/windeployqt/CMakeLists.txt
+++ b/tests/auto/tools/windeployqt/CMakeLists.txt
@@ -1,7 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from windeployqt.pro.
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_windeployqt LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
 
 add_subdirectory(testapp)
 add_subdirectory(test)
diff --git a/tests/auto/tools/windeployqt/test/CMakeLists.txt b/tests/auto/tools/windeployqt/test/CMakeLists.txt
index c96da3fefb..1ba62d5850 100644
--- a/tests/auto/tools/windeployqt/test/CMakeLists.txt
+++ b/tests/auto/tools/windeployqt/test/CMakeLists.txt
@@ -1,14 +1,12 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from test.pro.
-
 #####################################################################
 ## tst_windeployqt Test:
 #####################################################################
 
 qt_internal_add_test(tst_windeployqt
-    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../tst_windeployqt.cpp
 )
diff --git a/tests/auto/tools/windeployqt/testapp/CMakeLists.txt b/tests/auto/tools/windeployqt/testapp/CMakeLists.txt
index edb4f129a4..ce94cd6464 100644
--- a/tests/auto/tools/windeployqt/testapp/CMakeLists.txt
+++ b/tests/auto/tools/windeployqt/testapp/CMakeLists.txt
@@ -1,13 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from testapp.pro.
-
 #####################################################################
 ## testapp Binary:
 #####################################################################
 
-qt_internal_add_executable(windeploy_testapp # special case
+qt_internal_add_executable(windeploy_testapp
     GUI
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
@@ -16,9 +14,7 @@ qt_internal_add_executable(windeploy_testapp # special case
         Qt::Gui
 )
 
-# special case begin
 set_target_properties(windeploy_testapp
     PROPERTIES
         OUTPUT_NAME testapp
 )
-# special case end
diff --git a/tests/auto/tools/windeployqt/testapp/main.cpp b/tests/auto/tools/windeployqt/testapp/main.cpp
index 7d74613f3a..775fe19827 100644
--- a/tests/auto/tools/windeployqt/testapp/main.cpp
+++ b/tests/auto/tools/windeployqt/testapp/main.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 <QGuiApplication>
 #include <QRasterWindow>
diff --git a/tests/auto/tools/windeployqt/tst_windeployqt.cpp b/tests/auto/tools/windeployqt/tst_windeployqt.cpp
index a3912889a8..0daf287807 100644
--- a/tests/auto/tools/windeployqt/tst_windeployqt.cpp
+++ b/tests/auto/tools/windeployqt/tst_windeployqt.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 <QtCore/QDebug>
 #include <QtCore/QDir>