4 files changed, 12 insertions, 17 deletions
diff --git a/tests/auto/core/CMakeLists.txt b/tests/auto/core/CMakeLists.txt
index 0d2340188..ecb3b2cf9 100644
--- a/tests/auto/core/CMakeLists.txt
+++ b/tests/auto/core/CMakeLists.txt
@@ -2,9 +2,8 @@ add_subdirectory(qwebenginecookiestore)
 add_subdirectory(qwebenginesettings)
 add_subdirectory(qwebengineurlrequestinterceptor)
 add_subdirectory(origins)
-if(NOT boot2qt)
-    add_subdirectory(devtools)
-endif()
+add_subdirectory(devtools)
+
 if(QT_FEATURE_ssl)
     add_subdirectory(qwebengineclientcertificatestore)
     add_subdirectory(certificateerror)
diff --git a/tests/auto/quick/CMakeLists.txt b/tests/auto/quick/CMakeLists.txt
index 3ad3b37c8..1d38470b3 100644
--- a/tests/auto/quick/CMakeLists.txt
+++ b/tests/auto/quick/CMakeLists.txt
@@ -2,11 +2,9 @@ add_subdirectory(dialogs)
 add_subdirectory(publicapi)
 add_subdirectory(qquickwebenginedefaultsurfaceformat)
 add_subdirectory(qtbug-70248)
-if(NOT boot2qt)
-    add_subdirectory(inspectorserver)
-    add_subdirectory(qmltests)
-    add_subdirectory(qquickwebengineview)
-endif()
+add_subdirectory(inspectorserver)
+add_subdirectory(qmltests)
+add_subdirectory(qquickwebengineview)
 if(QT_FEATURE_webenginequick_testsupport)
     add_subdirectory(qquickwebengineviewgraphics)
 endif()
diff --git a/tests/auto/widgets/CMakeLists.txt b/tests/auto/widgets/CMakeLists.txt
index f3e3edc90..bedb00f53 100644
--- a/tests/auto/widgets/CMakeLists.txt
+++ b/tests/auto/widgets/CMakeLists.txt
@@ -1,9 +1,7 @@
-if(NOT boot2qt)
-    add_subdirectory(defaultsurfaceformat)
-    add_subdirectory(qwebenginepage)
-    add_subdirectory(qwebengineprofile)
-    add_subdirectory(qwebengineview)
-endif()
+add_subdirectory(defaultsurfaceformat)
+add_subdirectory(qwebenginepage)
+add_subdirectory(qwebengineprofile)
+add_subdirectory(qwebengineview)
 add_subdirectory(favicon)
 add_subdirectory(loadsignals)
 add_subdirectory(proxy)
@@ -19,7 +17,7 @@ endif()
 if(NOT MACOS)
     add_subdirectory(touchinput)
 endif()
-if(QT_FEATURE_accessibility AND NOT boot2qt)
+if(QT_FEATURE_accessibility)
     add_subdirectory(accessibility)
 endif()
 if(QT_FEATURE_webengine_printing_and_pdf)
diff --git a/tests/auto/widgets/proxypac/CMakeLists.txt b/tests/auto/widgets/proxypac/CMakeLists.txt
index 084e55f81..1dd2c8bec 100644
--- a/tests/auto/widgets/proxypac/CMakeLists.txt
+++ b/tests/auto/widgets/proxypac/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_proxypac_file
 if(WIN32)
     get_filename_component(SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}" REALPATH)
     set(fileEnvArg "--proxy-pac-url=\"file:///${SOURCE_DIR}/proxy.pac\"")
-elseif(boot2qt)
+elseif(LINUX AND CMAKE_CROSSCOMPILING)
     set(fileEnvArg "--single-process --no-sandbox --proxy-pac-url=\"file://${CMAKE_CURRENT_LIST_DIR}/proxy.pac\"")
 else()
     set(fileEnvArg "--proxy-pac-url=\"file://${CMAKE_CURRENT_LIST_DIR}/proxy.pac\"")
@@ -29,7 +29,7 @@ qt_internal_add_test(tst_proxypac_qrc
         Test::HttpServer
 )
 
-if(boot2qt)
+if(LINUX AND CMAKE_CROSSCOMPILING)
     set(qrcEnvArg "--single-process --no-sandbox --proxy-pac-url=\"qrc:///proxy.pac\"")
 else()
     set(qrcEnvArg "--proxy-pac-url=\"qrc:///proxy.pac\"")