aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksei German <aleksei.german@qt.io>2023-06-16 14:26:16 +0200
committerTim Jenssen <tim.jenssen@qt.io>2023-06-16 13:40:07 +0000
commit66872b3c94a8514f982fd6e7d81003d49ed27cea (patch)
tree9cbc52e875bf1eb2fc3af713a817d74df126bbfb
parente30873adeb1337225113a5910d4b91a5d6af188c (diff)
QmlDesigner: Cleanup MCU template
Change-Id: Id75b042921fd2e3c6644abfce10a752ca20ff0a4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit 61ed550a120c149294f83fd3ef59b4ddfaba94ff)
-rw-r--r--share/qtcreator/qmldesigner/studio_templates/projects/app_mcu.qmlproject2
-rw-r--r--share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Constants.qml.tpl2
-rw-r--r--share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Screen01.ui.qml.tpl4
-rw-r--r--share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/main.qml.tpl4
4 files changed, 6 insertions, 6 deletions
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/app_mcu.qmlproject b/share/qtcreator/qmldesigner/studio_templates/projects/app_mcu.qmlproject
index 84bd0791ce..50e5b9a357 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/app_mcu.qmlproject
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/app_mcu.qmlproject
@@ -54,7 +54,7 @@ Project {
QDS.qtForMCUs: true
QDS.qt6Project: true
- QDS.qdsVersion: "4.1"
+ QDS.qdsVersion: "4.2"
QDS.quickVersion: "6.5"
/* List of plugin directories passed to QML runtime */
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Constants.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Constants.qml.tpl
index ad50e39e9a..c6bbb00199 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Constants.qml.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Constants.qml.tpl
@@ -1,5 +1,5 @@
pragma Singleton
-import QtQuick 6.5
+import QtQuick
QtObject {
readonly property int width: %{ScreenWidth}
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Screen01.ui.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Screen01.ui.qml.tpl
index 4a70ce692b..4a16e2c6b1 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Screen01.ui.qml.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Screen01.ui.qml.tpl
@@ -5,8 +5,8 @@ this file manually, you might introduce QML code that is not supported by Qt Des
Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
*/
-import QtQuick 6.5
-import Constants 1.0
+import QtQuick
+import Constants
Rectangle {
width: Constants.width
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/main.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/main.qml.tpl
index e25113c67f..cd6a735a09 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/main.qml.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/main.qml.tpl
@@ -1,5 +1,5 @@
-import QtQuick 6.5
-import Constants 1.0
+import QtQuick
+import Constants
Item {
width: Constants.width