diff options
author | Aleksei German <aleksei.german@qt.io> | 2022-03-31 18:20:28 +0200 |
---|---|---|
committer | Aleksei German <aleksei.german@qt.io> | 2022-04-25 10:54:04 +0000 |
commit | da16d778d57e16d15d6445509543994ce7f65bc1 (patch) | |
tree | e98572c30e5be2d072d4e0d068985e9b021c74d8 | |
parent | 6228e190ec2e154404f5c3d0d6b88b8ab1049d37 (diff) |
QmlDesigner: Fix for builds in default MCU projectv7.0.1
Task-number: QDS-6599
Change-Id: I77d7f6f8a0df8a9992956d5d23d2e219c1e4f077
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r-- | share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/CMakeLists.txt b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/CMakeLists.txt index c776d4f8a5..fa5be38128 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/CMakeLists.txt +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/CMakeLists.txt @@ -40,12 +40,14 @@ qul_add_qml_module(ConstantsModule imports/Constants/Constants.qml ) -# Using recurse search to find all qml files in project directory -# Excluding Constants folder because it is part of another qml module -# Excluding MCUDefaultStyle because it exists for compatibility purposes with QDS +message(WARNING "It is recommended to replace the recursive search with the actual list of .qml files in your project.") file(GLOB_RECURSE qmlSources "*.qml") +# Excluding Constants folder because it is part of another qml module list(FILTER qmlSources EXCLUDE REGEX ".*/imports/Constants/.*") +# Excluding MCUDefaultStyle because it exists for compatibility purposes with QDS list(FILTER qmlSources EXCLUDE REGEX ".*/MCUDefaultStyle/.*") +# Excluding binary directory because it can break builds in source dir +list(FILTER qmlSources EXCLUDE REGEX "${CMAKE_CURRENT_BINARY_DIR}/.*") qul_target_qml_sources(%{ProjectName} ${qmlSources}) if (Qul_VERSION VERSION_GREATER_EQUAL "2.0") |