5 files changed, 18 insertions, 1 deletions
diff --git a/tests/auto/qml/.prev_CMakeLists.txt b/tests/auto/qml/.prev_CMakeLists.txt
index 3f453e4ded..7bcdb68e09 100644
--- a/tests/auto/qml/.prev_CMakeLists.txt
+++ b/tests/auto/qml/.prev_CMakeLists.txt
@@ -26,6 +26,10 @@ add_subdirectory(qqmlsettings)
 add_subdirectory(qqmlstatemachine)
 add_subdirectory(qmldiskcache)
 add_subdirectory(qqmlmetatype)
+if(TARGET Qt::Widgets)
+    add_subdirectory(qjsengine)
+    add_subdirectory(qjsvalue)
+endif()
 if(QT_FEATURE_process AND QT_FEATURE_qml_debug)
     add_subdirectory(debugger)
 endif()
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt
index 7592f09eba..dec41a2219 100644
--- a/tests/auto/qml/CMakeLists.txt
+++ b/tests/auto/qml/CMakeLists.txt
@@ -26,6 +26,10 @@ add_subdirectory(qqmlsettings)
 add_subdirectory(qqmlstatemachine)
 add_subdirectory(qmldiskcache)
 add_subdirectory(qqmlmetatype)
+if(TARGET Qt::Widgets)
+    add_subdirectory(qjsengine)
+    add_subdirectory(qjsvalue)
+endif()
 if(QT_FEATURE_process AND QT_FEATURE_qml_debug)
     add_subdirectory(debugger)
 endif()
diff --git a/tests/auto/qml/qjsengine/CMakeLists.txt b/tests/auto/qml/qjsengine/CMakeLists.txt
index aaff27ee03..6b6b12399c 100644
--- a/tests/auto/qml/qjsengine/CMakeLists.txt
+++ b/tests/auto/qml/qjsengine/CMakeLists.txt
@@ -10,15 +10,20 @@ file(GLOB_RECURSE test_data_glob
     script/*)
 list(APPEND test_data ${test_data_glob})
 
+qt_find_package(Threads PROVIDED_TARGETS Threads::Threads) # special case
+
 qt_add_test(tst_qjsengine
     SOURCES
         tst_qjsengine.cpp
     PUBLIC_LIBRARIES
+        Qt::Core
         Qt::Gui
         Qt::GuiPrivate
         Qt::Qml
         Qt::QmlPrivate
         Qt::Widgets
+    LIBRARIES # special case
+        Threads::Threads # special case
     TESTDATA ${test_data}
 )
 
diff --git a/tests/auto/qml/qjsvalue/CMakeLists.txt b/tests/auto/qml/qjsvalue/CMakeLists.txt
index 74789968d3..0c466ef874 100644
--- a/tests/auto/qml/qjsvalue/CMakeLists.txt
+++ b/tests/auto/qml/qjsvalue/CMakeLists.txt
@@ -4,6 +4,8 @@
 ## tst_qjsvalue Test:
 #####################################################################
 
+qt_find_package(Threads PROVIDED_TARGETS Threads::Threads) # special case
+
 qt_add_test(tst_qjsvalue
     SOURCES
         tst_qjsvalue.cpp tst_qjsvalue.h
@@ -13,6 +15,8 @@ qt_add_test(tst_qjsvalue
         Qt::Qml
         Qt::QmlPrivate
         Qt::Widgets
+    LIBRARIES # special case
+        Threads::Threads # special case
 )
 
 ## Scopes:
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 7a2ba10096..418d3d4cb5 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -79,7 +79,7 @@ PRIVATETESTS += \
     v4misc
 
 qtHaveModule(widgets) {
-    PUBLICTESTS += \
+    SUBDIRS += \
         qjsengine \
         qjsvalue \
 #        qwidgetsinqml