diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2024-04-17 12:54:18 +0200 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2024-04-17 14:23:37 +0200 |
commit | 97b9b619a12c88b9b72cc823363e01278237be91 (patch) | |
tree | 5f0a192398f807cd458f56dccc3643fd99389a41 /src | |
parent | 9af76f3b7da895df3c87772885108548380d87ed (diff) |
QDS Components: Allow disabling lint targets
QDS Components is brought into user projects via FetchConent. When this
is done, all qt_internal_add_qml_module call will add their lint target
to the all_qmllint target; however, the user most likely won't care
about warnings therein.
Ideally, QDS would be warning free, but even if it were, it is wasteful
to run qmllint on it when it is only brought in via FetchContent.
By setting QT_QDS_COMPONENTS_NOWARN before FetchContent is called, we
can indicate that linting ought to be disabled.
Change-Id: I45351f6e401fa173848728b70f9d18e7217bca98
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/imports/application/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/imports/compat/Components/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/imports/compat/Profiling/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/imports/compat/QtAndroidAutomotive/ActivityView/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/imports/components/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/imports/designeffects/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/imports/effects_qt6/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/imports/flowview/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/imports/logichelper/CMakeLists.txt | 1 |
10 files changed, 14 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3af0139..b6bcf37 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,9 @@ qt_path_join(targetbasedir ${CMAKE_BINARY_DIR} "qml") qt_path_join(qmlinstalldir ${QT_INSTALL_DIR} ${INSTALL_QMLDIR}) +set(qds_qml_extra_args "") +if(QT_QDS_COMPONENTS_NOWARN) + list(APPEND qds_qml_extra_args NO_LINT) +endif() + add_subdirectory(imports) diff --git a/src/imports/application/CMakeLists.txt b/src/imports/application/CMakeLists.txt index 175a85f..0200f07 100644 --- a/src/imports/application/CMakeLists.txt +++ b/src/imports/application/CMakeLists.txt @@ -7,6 +7,7 @@ qt_internal_add_qml_module(QuickStudioApplication VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED PAST_MAJOR_VERSIONS 1 + ${qds_qml_extra_args} INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} SOURCES diff --git a/src/imports/compat/Components/CMakeLists.txt b/src/imports/compat/Components/CMakeLists.txt index 83eeb7d..6f94868 100644 --- a/src/imports/compat/Components/CMakeLists.txt +++ b/src/imports/compat/Components/CMakeLists.txt @@ -3,6 +3,7 @@ qt_internal_add_qml_module(QuickUltraLiteStudioComponents VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED NO_SYNC_QT + ${qds_qml_extra_args} PAST_MAJOR_VERSIONS 1 2 diff --git a/src/imports/compat/Profiling/CMakeLists.txt b/src/imports/compat/Profiling/CMakeLists.txt index 28092bc..07f0386 100644 --- a/src/imports/compat/Profiling/CMakeLists.txt +++ b/src/imports/compat/Profiling/CMakeLists.txt @@ -3,6 +3,7 @@ qt_internal_add_qml_module(QuickUltraLiteStudioProfiling VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED NO_SYNC_QT + ${qds_qml_extra_args} PAST_MAJOR_VERSIONS 1 2 diff --git a/src/imports/compat/QtAndroidAutomotive/ActivityView/CMakeLists.txt b/src/imports/compat/QtAndroidAutomotive/ActivityView/CMakeLists.txt index cd6d69c..f302218 100644 --- a/src/imports/compat/QtAndroidAutomotive/ActivityView/CMakeLists.txt +++ b/src/imports/compat/QtAndroidAutomotive/ActivityView/CMakeLists.txt @@ -3,6 +3,7 @@ qt_internal_add_qml_module(AndroidAutomotiveActivityView VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED NO_SYNC_QT + ${qds_qml_extra_args} PAST_MAJOR_VERSIONS 1 QML_FILES ActivityView.qml diff --git a/src/imports/components/CMakeLists.txt b/src/imports/components/CMakeLists.txt index 9f28a52..9f56100 100644 --- a/src/imports/components/CMakeLists.txt +++ b/src/imports/components/CMakeLists.txt @@ -2,6 +2,7 @@ qt_internal_add_qml_module(QuickStudioComponents URI "QtQuick.Studio.Components" VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED + ${qds_qml_extra_args} NO_SYNC_QT PAST_MAJOR_VERSIONS 1 QML_FILES diff --git a/src/imports/designeffects/CMakeLists.txt b/src/imports/designeffects/CMakeLists.txt index e1ee5b4..dd497b7 100644 --- a/src/imports/designeffects/CMakeLists.txt +++ b/src/imports/designeffects/CMakeLists.txt @@ -3,6 +3,7 @@ qt_internal_add_qml_module(QuickStudioDesignEffects VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED NO_SYNC_QT + ${qds_qml_extra_args} PAST_MAJOR_VERSIONS 1 QML_FILES DesignBackgroundBlurPrivate.qml diff --git a/src/imports/effects_qt6/CMakeLists.txt b/src/imports/effects_qt6/CMakeLists.txt index 1b51c72..505bf31 100644 --- a/src/imports/effects_qt6/CMakeLists.txt +++ b/src/imports/effects_qt6/CMakeLists.txt @@ -4,6 +4,7 @@ qt_internal_add_qml_module(QuickStudioEffects DESIGNER_SUPPORTED NO_SYNC_QT PAST_MAJOR_VERSIONS 1 + ${qds_qml_extra_args} QML_FILES FastBlurItem.qml GlowItem.qml diff --git a/src/imports/flowview/CMakeLists.txt b/src/imports/flowview/CMakeLists.txt index e96174b..00e65e7 100644 --- a/src/imports/flowview/CMakeLists.txt +++ b/src/imports/flowview/CMakeLists.txt @@ -7,6 +7,7 @@ qt_internal_add_qml_module(FlowView URI "FlowView" VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED + ${qds_qml_extra_args} NO_SYNC_QT PAST_MAJOR_VERSIONS 1 NO_GENERATE_QMLDIR diff --git a/src/imports/logichelper/CMakeLists.txt b/src/imports/logichelper/CMakeLists.txt index 0d2a234..a23cc64 100644 --- a/src/imports/logichelper/CMakeLists.txt +++ b/src/imports/logichelper/CMakeLists.txt @@ -1,6 +1,7 @@ qt_internal_add_qml_module(QuickStudioLogicHelper URI "QtQuick.Studio.LogicHelper" VERSION "${PROJECT_VERSION}" + ${qds_qml_extra_args} DESIGNER_SUPPORTED NO_SYNC_QT PAST_MAJOR_VERSIONS 1 |