diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2022-05-11 09:48:41 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-05-12 15:39:23 +0000 |
| commit | 0a20d18f69927417ff096599a2dbbbf56ad01524 (patch) | |
| tree | d3d061f8b095d60c840a983946352550b4858be8 | |
| parent | 58813b3c1ec6e9162f1ca77702651689b92e3cbb (diff) | |
Re-add qmlprofiler qmleasing and qmlplugindump to default target
I don't know what the CI is doing there, but fundamentally you cannot
remove those tools from the default target and then install them.
Apparently they were removed from the default target because they don't
work on iOS. Well, they indeed don't work on iOS. Let's make that
explicit instead.
Amends commit c1ae217a52ace4b955577bf0aaf1c4c8afb8b81b
Change-Id: I3759b03425fcdfc604483632f28be2748fe0efdb
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 53ee2748ac05534dab895bab19449a3d5207900a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tools/CMakeLists.txt | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index c12152343d..48545ff2d2 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,12 +1,5 @@ # Generated from tools.pro. - -qt_exclude_tool_directories_from_default_target( - qmlprofiler - qmlplugindump - qmleasing -) - if(QT_FEATURE_qml_devtools) add_subdirectory(qmldom) add_subdirectory(qmllint) @@ -27,7 +20,12 @@ endif() if(QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND NOT IOS AND NOT rtems) add_subdirectory(qml) endif() -if(QT_FEATURE_qml_profiler AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND NOT rtems) +if(QT_FEATURE_qml_profiler + AND QT_FEATURE_thread + AND NOT ANDROID + AND NOT IOS + AND NOT WASM + AND NOT rtems) add_subdirectory(qmlprofiler) endif() if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND NOT IOS AND NOT rtems) @@ -37,7 +35,15 @@ if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDRO add_subdirectory(qmlscene) add_subdirectory(qmltime) endif() -if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_process AND QT_FEATURE_regularexpression AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT rtems) +if(QT_BUILD_SHARED_LIBS + AND QT_FEATURE_process + AND QT_FEATURE_regularexpression + AND QT_FEATURE_thread + AND TARGET Qt::Quick + AND NOT ANDROID + AND NOT IOS + AND NOT WASM + AND NOT rtems) add_subdirectory(qmlplugindump) endif() if(TARGET Qt::Quick @@ -52,6 +58,7 @@ if(TARGET Qt::Quick AND QT_FEATURE_spinbox AND QT_FEATURE_textedit AND NOT ANDROID + AND NOT IOS AND NOT WASM AND NOT rtems) add_subdirectory(qmleasing) |