diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/linguist/lupdate/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/qdoc/CMakeLists.txt | 9 |
3 files changed, 9 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c117c45d4..8af1b88b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ endif() find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network) find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS - DBus Xml Widgets Quick QuickWidgets QmlDevToolsPrivate + DBus Xml Widgets Quick QuickWidgets Qml Sql PrintSupport OpenGL OpenGLWidgets ${optional_components}) # special case end diff --git a/src/linguist/lupdate/CMakeLists.txt b/src/linguist/lupdate/CMakeLists.txt index 848c5ddc8..ace7e2c98 100644 --- a/src/linguist/lupdate/CMakeLists.txt +++ b/src/linguist/lupdate/CMakeLists.txt @@ -61,14 +61,14 @@ qt_internal_add_tool(${target_name} ## Scopes: ##################################################################### -qt_internal_extend_target(${target_name} CONDITION TARGET Qt::QmlDevToolsPrivate +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::QmlPrivate SOURCES qdeclarative.cpp - PUBLIC_LIBRARIES - Qt::QmlDevToolsPrivate + LIBRARIES + Qt::QmlPrivate ) -qt_internal_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlDevToolsPrivate +qt_internal_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlPrivate DEFINES QT_NO_QML ) diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt index 84099ca32..2e4c6bf82 100644 --- a/src/qdoc/CMakeLists.txt +++ b/src/qdoc/CMakeLists.txt @@ -110,12 +110,12 @@ qt_internal_add_tool(${target_name} #### Keys ignored in scope 2:.:.:qdoc.pro:NOT force_bootstrap: # _REQUIREMENTS = "qtConfig(xmlstreamwriter)" -qt_internal_extend_target(${target_name} CONDITION TARGET Qt::QmlDevToolsPrivate - PUBLIC_LIBRARIES - Qt::QmlDevToolsPrivate +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::QmlPrivate + LIBRARIES + Qt::QmlPrivate ) -qt_internal_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlDevToolsPrivate +qt_internal_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlPrivate DEFINES QT_NO_DECLARATIVE ) @@ -130,4 +130,3 @@ qt_internal_extend_target(${target_name} CONDITION (WIN32 AND ICC) OR MSVC qt_internal_add_docs(${target_name} doc/config/qdoc.qdocconf ) - |