From fb69efb9c9ea2f96c1fe534274e94697c2092c2f Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Wed, 13 Mar 2024 20:27:45 +0100
Subject: [PATCH] CMake: Make a few more auto tests standalone

Pick-to: 6.7
Change-Id: I80988114bd906447a2ab712d5432a489e095a5c1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt    | 6 ++++++
 tests/auto/corelib/tools/qspan/CMakeLists.txt               | 6 ++++++
 tests/auto/network/access/qhttpheaders/CMakeLists.txt       | 6 ++++++
 .../network/access/qnetworkrequestfactory/CMakeLists.txt    | 6 ++++++
 tests/auto/network/access/qrestaccessmanager/CMakeLists.txt | 6 ++++++
 tests/auto/sql/kernel/qvfssql/CMakeLists.txt                | 6 ++++++
 tests/auto/wasm/selenium/CMakeLists.txt                     | 2 +-
 7 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt b/tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt
index 21967cdc078..25b8812153b 100644
--- a/tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt
+++ b/tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt
@@ -1,6 +1,12 @@
 # Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qcomparehelpers LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qcomparehelpers
     SOURCES
         tst_qcomparehelpers.h tst_qcomparehelpers.cpp tst_qcomparehelpers1.cpp
diff --git a/tests/auto/corelib/tools/qspan/CMakeLists.txt b/tests/auto/corelib/tools/qspan/CMakeLists.txt
index d7ea7429649..595d19dc433 100644
--- a/tests/auto/corelib/tools/qspan/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qspan/CMakeLists.txt
@@ -1,6 +1,12 @@
 # Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qspan LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qspan
     SOURCES
         tst_qspan.cpp
diff --git a/tests/auto/network/access/qhttpheaders/CMakeLists.txt b/tests/auto/network/access/qhttpheaders/CMakeLists.txt
index fb88c97f446..0de1f96c67f 100644
--- a/tests/auto/network/access/qhttpheaders/CMakeLists.txt
+++ b/tests/auto/network/access/qhttpheaders/CMakeLists.txt
@@ -1,6 +1,12 @@
 # Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qhttpheaders LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qhttpheaders
     SOURCES
         tst_qhttpheaders.cpp
diff --git a/tests/auto/network/access/qnetworkrequestfactory/CMakeLists.txt b/tests/auto/network/access/qnetworkrequestfactory/CMakeLists.txt
index 0b639d254d8..d2112de58fa 100644
--- a/tests/auto/network/access/qnetworkrequestfactory/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkrequestfactory/CMakeLists.txt
@@ -1,6 +1,12 @@
 # Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qnetworkrequestfactory LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qnetworkrequestfactory
     SOURCES
         tst_qnetworkrequestfactory.cpp
diff --git a/tests/auto/network/access/qrestaccessmanager/CMakeLists.txt b/tests/auto/network/access/qrestaccessmanager/CMakeLists.txt
index 08e452331f2..614248be289 100644
--- a/tests/auto/network/access/qrestaccessmanager/CMakeLists.txt
+++ b/tests/auto/network/access/qrestaccessmanager/CMakeLists.txt
@@ -1,6 +1,12 @@
 # Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qrestaccessmanager LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qrestaccessmanager
     SOURCES
         tst_qrestaccessmanager.cpp
diff --git a/tests/auto/sql/kernel/qvfssql/CMakeLists.txt b/tests/auto/sql/kernel/qvfssql/CMakeLists.txt
index 184f0a578d6..7c66f055a64 100644
--- a/tests/auto/sql/kernel/qvfssql/CMakeLists.txt
+++ b/tests/auto/sql/kernel/qvfssql/CMakeLists.txt
@@ -5,6 +5,12 @@
 ## tst_qsqlfield Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qvfssql LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qvfssql
     SOURCES
         tst_qvfssql.cpp
diff --git a/tests/auto/wasm/selenium/CMakeLists.txt b/tests/auto/wasm/selenium/CMakeLists.txt
index 7b16af359f9..043e994ce45 100644
--- a/tests/auto/wasm/selenium/CMakeLists.txt
+++ b/tests/auto/wasm/selenium/CMakeLists.txt
@@ -1,7 +1,7 @@
 if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
     cmake_minimum_required(VERSION 3.16)
     project(tst_qwasmwindow_harness LANGUAGES CXX)
-    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST Core Gui Test)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
 endif()
 
 qt_internal_add_test(tst_qwasmwindow_harness