From 66872b3c94a8514f982fd6e7d81003d49ed27cea Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Fri, 16 Jun 2023 14:26:16 +0200 Subject: [PATCH] QmlDesigner: Cleanup MCU template Change-Id: Id75b042921fd2e3c6644abfce10a752ca20ff0a4 Reviewed-by: Tim Jenssen (cherry picked from commit 61ed550a120c149294f83fd3ef59b4ddfaba94ff) --- .../qmldesigner/studio_templates/projects/app_mcu.qmlproject | 2 +- .../projects/application-mcu/Constants.qml.tpl | 2 +- .../projects/application-mcu/Screen01.ui.qml.tpl | 4 ++-- .../studio_templates/projects/application-mcu/main.qml.tpl | 4 ++-- 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 84bd0791ce9..50e5b9a357c 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 ad50e39e9ac..c6bbb001993 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 4a70ce692b6..4a16e2c6b1c 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 e25113c67f9..cd6a735a099 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