diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2023-05-04 12:54:44 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2023-05-09 21:28:07 +0200 |
| commit | 41f36038fb2618561b2405efbdaf7ccd5bf3769d (patch) | |
| tree | 9113b7f00438ec9b77a21e76622275447af6b05c | |
| parent | 69bc59c90ff93f8780ee7dba3b00db861e313a05 (diff) | |
| download | qtdeclarative-41f36038fb2618561b2405efbdaf7ccd5bf3769d.tar.gz | |
Remove the 'qml-devtools' feature
The meaning of the feature has changed and tools that depends on this
feature now need to be built unconditionally. So the feature should be
removed to avoid confusing users.
[ChangeLog][QtQml][Tools] The 'qml-devtools' feature is removed. All
tools that depend on this feature are mandatory and need to be build
unconditionally.
Fixes: QTBUG-113221
Pick-to: 6.5
Change-Id: Ia026684703d847ce777d7a2916f04b3c90727695
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | src/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/qml/configure.cmake | 5 | ||||
| -rw-r--r-- | tools/CMakeLists.txt | 26 |
3 files changed, 17 insertions, 26 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 08678b8fc0..7196674a92 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -80,14 +80,12 @@ add_subdirectory(labs) # These need to be included here since they have dependencies on the modules # specified above. -if(QT_FEATURE_qml_devtools) - add_subdirectory(qmlcompiler) - add_subdirectory(qmldom) +add_subdirectory(qmlcompiler) +add_subdirectory(qmldom) - # Build qmlcachegen now, so that we can use it in src/imports. - if(QT_FEATURE_qml_devtools AND QT_FEATURE_xmlstreamwriter) - add_subdirectory(../tools/qmlcachegen qmlcachegen) - endif() +# Build qmlcachegen now, so that we can use it in src/imports. +if(QT_FEATURE_xmlstreamwriter) + add_subdirectory(../tools/qmlcachegen qmlcachegen) endif() if(QT_FEATURE_thread AND TARGET Qt::LanguageServerPrivate AND NOT WASM AND NOT IOS AND NOT ANDROID AND NOT QNX AND NOT INTEGRITY AND NOT WEBOS) diff --git a/src/qml/configure.cmake b/src/qml/configure.cmake index 9f82bdecd9..654fc2ec9d 100644 --- a/src/qml/configure.cmake +++ b/src/qml/configure.cmake @@ -160,11 +160,6 @@ qt_feature("qml-preview" PRIVATE PURPOSE "Updates QML documents in your application live as you change them on disk" CONDITION ( QT_FEATURE_commandlineparser ) AND ( QT_FEATURE_filesystemwatcher ) AND ( QT_FEATURE_qml_network AND QT_FEATURE_localserver ) AND ( QT_FEATURE_process ) AND ( QT_FEATURE_qml_debug ) ) -qt_feature("qml-devtools" PRIVATE - SECTION "QML" - LABEL "QML Development Tools" - PURPOSE "Provides the QmlDevtools library and various utilities." -) qt_feature("qml-xml-http-request" PRIVATE SECTION "QML" LABEL "QML XML http request" diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index a99cd33c24..75b240aeea 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -3,21 +3,19 @@ # Generated from tools.pro. -if(QT_FEATURE_qml_devtools) - add_subdirectory(qmldom) - if(QT_FEATURE_commandlineparser) - add_subdirectory(qmllint) - add_subdirectory(qmltc) - add_subdirectory(qmltyperegistrar) - endif() - add_subdirectory(qmlimportscanner) - add_subdirectory(qmlformat) - if (TARGET Qt::LanguageServerPrivate - AND NOT WASM AND NOT IOS AND NOT ANDROID AND NOT QNX AND NOT INTEGRITY AND NOT WEBOS) - add_subdirectory(qmlls) - endif() +add_subdirectory(qmldom) +if(QT_FEATURE_commandlineparser) + add_subdirectory(qmllint) + add_subdirectory(qmltc) + add_subdirectory(qmltyperegistrar) endif() -if(QT_FEATURE_qml_devtools AND QT_FEATURE_xmlstreamwriter) +add_subdirectory(qmlimportscanner) +add_subdirectory(qmlformat) +if (TARGET Qt::LanguageServerPrivate + AND NOT WASM AND NOT IOS AND NOT ANDROID AND NOT QNX AND NOT INTEGRITY AND NOT WEBOS) + add_subdirectory(qmlls) +endif() +if(QT_FEATURE_xmlstreamwriter) # special case begin # Do not build qmlcachegen here but build it at src/ # time, so that we can use it for our own .qml files in src/imports. |