From b4dfda5814ca8c5be4d106ce485cb409bafdad28 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 28 Feb 2020 16:08:18 +0100 Subject: [PATCH] McuSupport: Let application wizard generate a .qmlproject in addition It sets the qtForMCUs flag to true, so the the QmlDesigner plugin can filter out the unsupported imports and properties. Change-Id: Ic5728ff334b410742518c564d88d72957d6c979d Reviewed-by: Thomas Hartmann --- src/plugins/mcusupport/mcusupport.qrc | 1 + .../application/project.qmlproject.tpl | 19 +++++++++++++++++++ .../wizards/application/wizard.json | 5 +++++ 3 files changed, 25 insertions(+) create mode 100644 src/plugins/mcusupport/wizards/application/project.qmlproject.tpl diff --git a/src/plugins/mcusupport/mcusupport.qrc b/src/plugins/mcusupport/mcusupport.qrc index c38ede5929c..b45fb8ccc31 100644 --- a/src/plugins/mcusupport/mcusupport.qrc +++ b/src/plugins/mcusupport/mcusupport.qrc @@ -7,6 +7,7 @@ wizards/icon.png wizards/icon@2x.png wizards/application/CMakeLists.txt + wizards/application/project.qmlproject.tpl wizards/application/main.qml.tpl wizards/application/wizard.json diff --git a/src/plugins/mcusupport/wizards/application/project.qmlproject.tpl b/src/plugins/mcusupport/wizards/application/project.qmlproject.tpl new file mode 100644 index 00000000000..0b5d6d58631 --- /dev/null +++ b/src/plugins/mcusupport/wizards/application/project.qmlproject.tpl @@ -0,0 +1,19 @@ +/* File generated by Qt Creator */ + +import QmlProject 1.1 + +Project { + mainFile: "%{MainQmlFile}" + qtForMCUs: true + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +} diff --git a/src/plugins/mcusupport/wizards/application/wizard.json b/src/plugins/mcusupport/wizards/application/wizard.json index 4e16d17e937..1c598507e13 100644 --- a/src/plugins/mcusupport/wizards/application/wizard.json +++ b/src/plugins/mcusupport/wizards/application/wizard.json @@ -47,6 +47,11 @@ "source": "CMakeLists.txt", "openAsProject": true }, + { + "source": "project.qmlproject.tpl", + "target": "%{ProjectDirectory}/%{ProjectName}.qmlproject", + "openInEditor": false + }, { "source": "main.qml.tpl", "target": "%{ProjectDirectory}/%{MainQmlFile}",