diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/qml/configure.cmake | 5 |
2 files changed, 5 insertions, 12 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" |