From 384bf8ded0db15f3587367cd026f05c215abda72 Mon Sep 17 00:00:00 2001 From: Tatiana Borisova Date: Mon, 6 Sep 2021 10:18:52 +0300 Subject: [PATCH] Compile autotests for Integrity (qtdeclarative module) -process environment is OFF for INTEGRITY Task-number: QTBUG-96176 Pick-to: 6.2 Change-Id: I29067ed30f173e96fe1085e942ba05b367e27cac Reviewed-by: Ulf Hermann --- tests/auto/qml/CMakeLists.txt | 6 ++++-- tests/auto/quicktest/CMakeLists.txt | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt index 95f53c7ac5..dfc3297079 100644 --- a/tests/auto/qml/CMakeLists.txt +++ b/tests/auto/qml/CMakeLists.txt @@ -62,7 +62,7 @@ endif() if(QT_FEATURE_private_tests) add_subdirectory(qqmlcpputils) add_subdirectory(qqmldirparser) - if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.19") + if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.19" AND QT_FEATURE_process) # Calls qt6_target_qml_sources() directly, which needs CMake 3.19+ add_subdirectory(qmlcachegen) endif() @@ -108,7 +108,9 @@ if(QT_FEATURE_private_tests) add_subdirectory(qv4mm) add_subdirectory(qv4identifiertable) add_subdirectory(qv4regexp) - add_subdirectory(ecmascripttests) + if(QT_FEATURE_process) + add_subdirectory(ecmascripttests) + endif() add_subdirectory(bindingdependencyapi) add_subdirectory(v4misc) add_subdirectory(qqmldelegatemodel) # special case diff --git a/tests/auto/quicktest/CMakeLists.txt b/tests/auto/quicktest/CMakeLists.txt index 45c763eec9..d21dff38b1 100644 --- a/tests/auto/quicktest/CMakeLists.txt +++ b/tests/auto/quicktest/CMakeLists.txt @@ -3,5 +3,7 @@ add_subdirectory(polish) add_subdirectory(signalspy) add_subdirectory(quicktestmainwithsetup) -add_subdirectory(testfiltering) +if(QT_FEATURE_process) + add_subdirectory(testfiltering) +endif() add_subdirectory(testswithcomponents)