qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 c1ae217a52

Change-Id: I3759b03425fcdfc604483632f28be2748fe0efdb
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 53ee2748ac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ulf Hermann 2022-05-11 09:48:41 +02:00 committed by Qt Cherry-pick Bot
parent 6351f16b68
commit a41c49c705
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/CMakeLists.txt
View File

@ -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)
@ -23,7 +16,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)
@ -33,7 +31,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
@ -48,6 +54,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)