1 files changed, 22 insertions, 15 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index f9291a7eb3..8f97c0eb7a 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -57,16 +57,16 @@ else()
 endif()
 
 expect_pass(test_wrap_cpp_and_resources)
-expect_pass(test_dependent_modules)
+if (NOT NO_WIDGETS)
+    expect_pass(test_dependent_modules)
+    expect_pass("test(needsquoting)dirname")
+endif()
 expect_fail(test_add_resource_options)
 expect_fail(test_wrap_cpp_options)
-expect_pass("test(needsquoting)dirname")
 expect_pass(test_platform_defs_include)
 expect_pass(test_qtmainwin_library)
 
-# If Qt D-Bus has been installed then run the tests for its macros.
-find_package(Qt5DBus QUIET)
-if (Qt5DBus_FOUND AND NOT APPLE)
+if (NOT NO_DBUS)
     expect_pass(test_dbus_module)
 endif()
 expect_pass(test_multiple_find_package)
@@ -80,30 +80,37 @@ expect_pass(test_testlib_definitions)
 expect_pass(test_json_plugin_includes)
 
 expect_fail(test_testlib_no_link_gui)
-expect_fail(test_testlib_no_link_widgets)
-
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy
     "${CMAKE_CURRENT_SOURCE_DIR}/test_testlib_definitions/main.cpp"
     "${CMAKE_CURRENT_BINARY_DIR}/failbuild/test_testlib_no_link_gui/test_testlib_no_link_gui/"
 )
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy
-    "${CMAKE_CURRENT_SOURCE_DIR}/test_testlib_definitions/main.cpp"
-    "${CMAKE_CURRENT_BINARY_DIR}/failbuild/test_testlib_no_link_widgets/test_testlib_no_link_widgets/"
-)
+
+if (NOT NO_WIDGETS)
+    expect_fail(test_testlib_no_link_widgets)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy
+        "${CMAKE_CURRENT_SOURCE_DIR}/test_testlib_definitions/main.cpp"
+        "${CMAKE_CURRENT_BINARY_DIR}/failbuild/test_testlib_no_link_widgets/test_testlib_no_link_widgets/"
+    )
+endif()
 
 set(qt_module_includes
   Core QObject
   Gui QImage
-  Widgets QWidget
   Network QHostInfo
-  OpenGL QGLBuffer
   Sql QSqlError
   Test QTestEventList
   Xml QDomDocument
-  PrintSupport QPrintDialog
 )
 
-if (UNIX AND NOT APPLE AND NOT QNXNTO)
+if (NOT NO_WIDGETS)
+  list(APPEND qt_module_includes
+    Widgets QWidget
+    OpenGL QGLBuffer
+    PrintSupport QPrintDialog
+  )
+endif()
+
+if (NOT NO_DBUS)
   list(APPEND qt_module_includes
     DBus QDBusMessage
   )