CMake: Regenerate projects after mergewip/cmake

Plus additional adjustments.

Change-Id: I0c2341ef6a5557e18df91b753f9e441c5b1a68e2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 8 insertions, 6 deletions

diff --git a/src/.prev_CMakeLists.txt b/src/.prev_CMakeLists.txt
index 08ee6c482..c6510b097 100644
--- a/src/.prev_CMakeLists.txt
+++ b/src/.prev_CMakeLists.txt
@@ -1,7 +1,6 @@
 # Generated from src.pro.
 
 add_subdirectory(linguist)
-add_subdirectory(qtattributionsscanner)
 add_subdirectory(global)
 if(QT_FEATURE_png AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets)
     add_subdirectory(assistant)
@@ -11,16 +10,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()
-if(QT_FEATURE_clang 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)
@@ -32,6 +34,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()