1 files changed, 10 insertions, 17 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a06b7e17c..ada59be6a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Generated from src.pro.
 
-add_subdirectory(global)
+add_subdirectory(global) # special case add as first directory
 add_subdirectory(linguist)
-add_subdirectory(qtattributionsscanner)
+# add_subdirectory(global) # special case remove
 if(QT_FEATURE_png AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets)
     add_subdirectory(assistant)
     add_subdirectory(designer)
@@ -11,26 +11,19 @@ endif()
 if(QT_FEATURE_png AND QT_FEATURE_thread AND QT_FEATURE_toolbutton AND TARGET Qt::Quick AND TARGET Qt::Widgets)
     add_subdirectory(distancefieldgenerator)
 endif()
-if(QT_FEATURE_library AND (android_app OR NOT ANDROID))
+if(QT_FEATURE_commandlineparser)
+    add_subdirectory(qtattributionsscanner)
+endif()
+if(QT_FEATURE_commandlineparser AND QT_FEATURE_library AND (android_app OR NOT ANDROID))
     add_subdirectory(qtplugininfo)
 endif()
-# special case begin
-qt_feature_module_begin(
-    NO_MODULE
-    PUBLIC_FILE "qdoc/qtqdoc-config.h"
-    PRIVATE_FILE "qdoc/qtqdoc-config_p.h"
-)
-include(qdoc/configure.cmake)
-qt_feature_module_end(NO_MODULE)
-# special case end
-
-if(QT_FEATURE_qdoc AND QT_FEATURE_thread)
+if(QT_FEATURE_clang AND QT_FEATURE_commandlineparser AND QT_FEATURE_thread)
     add_subdirectory(qdoc)
 endif()
-if(android_app OR NOT ANDROID)
+if(android_app OR (QT_FEATURE_commandlineparser AND NOT ANDROID))
     add_subdirectory(qtpaths)
 endif()
-if(APPLE_OSX)
+if(MACOS)
     add_subdirectory(macdeployqt)
 endif()
 if(TARGET Qt::DBus)
@@ -42,6 +35,6 @@ endif()
 if(WINRT)
     add_subdirectory(winrtrunner)
 endif()
-if(TARGET Qt::Gui AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT QNX AND NOT WASM AND NOT WINRT)
+if(QT_FEATURE_commandlineparser AND TARGET Qt::Gui AND NOT ANDROID AND NOT QNX AND NOT UIKIT AND NOT WASM AND NOT WINRT)
     add_subdirectory(qtdiag)
 endif()