aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksei German <aleksei.german@qt.io>2023-05-03 16:54:21 +0200
committerAleksei German <aleksei.german@qt.io>2023-05-05 10:30:42 +0000
commita2d22cc8591628fe9ec6251a41a2cb57453647ce (patch)
treee2d4f3dae98e3cc306052b31948369468db058ad
parent2711d96be3c213a64c3e4cddb92c6410b7bcdb7e (diff)
QmlDesigner: Fix for Qt for MCUs metadata, sheets
Includes: - adds metadata sheets for newer version - bumps metadata.qml default version - tweaks to allowed properties and types - some resorting and minor reformating of the metadata - property editor sheet mcu-related changes for Timer Task-number: QDS-9823 Change-Id: Iedb27047c533b80ba008afeee1ea28a99c8ab19d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Aleksei German <aleksei.german@qt.io>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQml/TimerSpecifics.qml3
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/metadata.qml14
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-14.qml29
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-17.qml29
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-18.qml33
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-19.qml33
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-20.qml33
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-21.qml36
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-22.qml37
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-23.qml211
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-24.qml210
11 files changed, 580 insertions, 88 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQml/TimerSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQml/TimerSpecifics.qml
index 9ff90a2b9f..8be28295d6 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQml/TimerSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQml/TimerSpecifics.qml
@@ -92,14 +92,17 @@ Column {
PropertyLabel {
text: qsTr("Triggered on start")
tooltip: qsTr("Sets the timer to trigger when started.")
+ blockedByTemplate: !triggeredOnStartComboBox.enabled
}
SecondColumnLayout {
CheckBox {
+ id: triggeredOnStartComboBox
text: backendValues.triggeredOnStart.valueToString
implicitWidth: StudioTheme.Values.twoControlColumnWidth
+ StudioTheme.Values.actionIndicatorWidth
backendValue: backendValues.triggeredOnStart
+ enabled: backendValues.triggeredOnStart.isAvailable
}
ExpandingSpacer {}
diff --git a/share/qtcreator/qmldesigner/qt4mcu/metadata.qml b/share/qtcreator/qmldesigner/qt4mcu/metadata.qml
index c5ff67fb0b..d4da42cc0a 100644
--- a/share/qtcreator/qmldesigner/qt4mcu/metadata.qml
+++ b/share/qtcreator/qmldesigner/qt4mcu/metadata.qml
@@ -5,7 +5,7 @@
Metadata {
id: metadataFile
- defaultVersion: v22
+ defaultVersion: v24
VersionData {
id: v14
@@ -48,4 +48,16 @@ Metadata {
name: "Qt for MCUs 2.2"
path: "qul-22.qml"
}
+
+ VersionData {
+ id: v23
+ name: "Qt for MCUs 2.3"
+ path: "qul-23.qml"
+ }
+
+ VersionData {
+ id: v24
+ name: "Qt for MCUs 2.4"
+ path: "qul-24.qml"
+ }
}
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml
index 376f83d226..2fedac684d 100644
--- a/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml
@@ -4,21 +4,23 @@
VersionData {
name: "Qt for MCUs 1.4"
- bannedItems: ["QtQuick.AnimatedImage",
- "QtQuick.FocusScope",
- "QtQuick.TextInput",
- "QtQuick.TextEdit",
+ bannedItems: [
+ "QtQuick.AnimatedImage",
+ "QtQuick.AnimatedSprite",
"QtQuick.Flow",
+ "QtQuick.FocusScope",
"QtQuick.Grid",
"QtQuick.GridView",
"QtQuick.PathView",
+ "QtQuick.TextEdit",
+ "QtQuick.TextInput",
"QtQuick.Loader",
"QtQuick.Controls",
"QtQuick.Controls.BusyIndicator",
"QtQuick.Controls.ButtonGroup",
"QtQuick.Controls.CheckDelegate",
- "QtQuick.Controls.Container",
"QtQuick.Controls.ComboBox",
+ "QtQuick.Controls.Container",
"QtQuick.Controls.DelayButton",
"QtQuick.Controls.Frame",
"QtQuick.Controls.GroupBox",
@@ -35,18 +37,21 @@ VersionData {
"QtQuick.Controls.StackView",
"QtQuick.Controls.SwipeDelegate",
"QtQuick.Controls.SwitchDelegate",
- "QtQuick.Controls.ToolBar",
- "QtQuick.Controls.ToolButton",
"QtQuick.Controls.TabBar",
"QtQuick.Controls.TabButton",
"QtQuick.Controls.TextArea",
"QtQuick.Controls.TextField",
+ "QtQuick.Controls.ToolBar",
+ "QtQuick.Controls.ToolButton",
"QtQuick.Controls.ToolSeparator",
- "QtQuick.Controls.Tumbler"]
+ "QtQuick.Controls.Tumbler"
+ ]
- allowedImports: ["QtQuick",
+ allowedImports: [
+ "QtQuick",
"QtQuick.Controls",
- "QtQuick.Timeline"]
+ "QtQuick.Timeline"
+ ]
bannedImports: ["FlowView"]
@@ -58,6 +63,10 @@ VersionData {
"strikeout", "underline", "styleName"]
}
+ QtQml.Timer {
+ bannedProperties: ["triggeredOnStart"]
+ }
+
QtQuick.Item {
bannedProperties: ["layer", "opacity", "smooth", "antialiasing",
"baselineOffset", "focus", "activeFocusOnTab",
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-17.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-17.qml
index 3a39626e74..95e10ad2e2 100644
--- a/share/qtcreator/qmldesigner/qt4mcu/qul-17.qml
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-17.qml
@@ -4,21 +4,23 @@
VersionData {
name: "Qt for MCUs 1.7"
- bannedItems: ["QtQuick.AnimatedImage",
- "QtQuick.FocusScope",
- "QtQuick.TextInput",
- "QtQuick.TextEdit",
+ bannedItems: [
+ "QtQuick.AnimatedImage",
+ "QtQuick.AnimatedSprite",
"QtQuick.Flow",
+ "QtQuick.FocusScope",
"QtQuick.Grid",
"QtQuick.GridView",
"QtQuick.PathView",
+ "QtQuick.TextEdit",
+ "QtQuick.TextInput",
"QtQuick.Loader",
"QtQuick.Controls",
"QtQuick.Controls.BusyIndicator",
"QtQuick.Controls.ButtonGroup",
"QtQuick.Controls.CheckDelegate",
- "QtQuick.Controls.Container",
"QtQuick.Controls.ComboBox",
+ "QtQuick.Controls.Container",
"QtQuick.Controls.DelayButton",
"QtQuick.Controls.Frame",
"QtQuick.Controls.GroupBox",
@@ -35,20 +37,23 @@ VersionData {
"QtQuick.Controls.StackView",
"QtQuick.Controls.SwipeDelegate",
"QtQuick.Controls.SwitchDelegate",
- "QtQuick.Controls.ToolBar",
- "QtQuick.Controls.ToolButton",
"QtQuick.Controls.TabBar",
"QtQuick.Controls.TabButton",
"QtQuick.Controls.TextArea",
"QtQuick.Controls.TextField",
+ "QtQuick.Controls.ToolBar",
+ "QtQuick.Controls.ToolButton",
"QtQuick.Controls.ToolSeparator",
- "QtQuick.Controls.Tumbler"]
+ "QtQuick.Controls.Tumbler"
+ ]
- allowedImports: ["QtQuick",
+ allowedImports: [
+ "QtQuick",
"QtQuick.Controls",
"QtQuick.Timeline",
"QtQuickUltralite.Extras",
- "QtQuickUltralite.Layers"]
+ "QtQuickUltralite.Layers"
+ ]
bannedImports: ["FlowView"]
@@ -60,6 +65,10 @@ VersionData {
"strikeout", "underline", "styleName"]
}
+ QtQml.Timer {
+ bannedProperties: ["triggeredOnStart"]
+ }
+
QtQuick.Item {
bannedProperties: ["layer", "opacity", "smooth", "antialiasing",
"baselineOffset", "focus", "activeFocusOnTab",
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-18.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-18.qml
index 2d501265e2..5e3a76277c 100644
--- a/share/qtcreator/qmldesigner/qt4mcu/qul-18.qml
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-18.qml
@@ -4,21 +4,23 @@
VersionData {
name: "Qt for MCUs 1.8"
- bannedItems: ["QtQuick.AnimatedImage",
- "QtQuick.FocusScope",
- "QtQuick.TextInput",
- "QtQuick.TextEdit",
+ bannedItems: [
+ "QtQuick.AnimatedImage",
+ "QtQuick.AnimatedSprite",
"QtQuick.Flow",
+ "QtQuick.FocusScope",
"QtQuick.Grid",
"QtQuick.GridView",
- "QtQuick.PathView",
"QtQuick.Loader",
+ "QtQuick.PathView",
+ "QtQuick.TextEdit",
+ "QtQuick.TextInput",
"QtQuick.Controls",
"QtQuick.Controls.BusyIndicator",
"QtQuick.Controls.ButtonGroup",
"QtQuick.Controls.CheckDelegate",
- "QtQuick.Controls.Container",
"QtQuick.Controls.ComboBox",
+ "QtQuick.Controls.Container",
"QtQuick.Controls.DelayButton",
"QtQuick.Controls.Frame",
"QtQuick.Controls.GroupBox",
@@ -35,25 +37,28 @@ VersionData {
"QtQuick.Controls.StackView",
"QtQuick.Controls.SwipeDelegate",
"QtQuick.Controls.SwitchDelegate",
- "QtQuick.Controls.ToolBar",
- "QtQuick.Controls.ToolButton",
"QtQuick.Controls.TabBar",
"QtQuick.Controls.TabButton",
"QtQuick.Controls.TextArea",
"QtQuick.Controls.TextField",
+ "QtQuick.Controls.ToolBar",
+ "QtQuick.Controls.ToolButton",
"QtQuick.Controls.ToolSeparator",
"QtQuick.Controls.Tumbler",
"QtQuick.Shapes.ConicalGradient",
"QtQuick.Shapes.LinearGradient",
"QtQuick.Shapes.RadialGradient",
- "QtQuick.Shapes.ShapeGradient"]
+ "QtQuick.Shapes.ShapeGradient"
+ ]
- allowedImports: ["QtQuick",
- "QtQuick.Shapes",
+ allowedImports: [
+ "QtQuick",
"QtQuick.Controls",
+ "QtQuick.Shapes",
"QtQuick.Timeline",
"QtQuickUltralite.Extras",
- "QtQuickUltralite.Layers"]
+ "QtQuickUltralite.Layers"
+ ]
bannedImports: ["FlowView"]
@@ -65,6 +70,10 @@ VersionData {
"strikeout", "underline", "styleName"]
}
+ QtQml.Timer {
+ bannedProperties: ["triggeredOnStart"]
+ }
+
QtQuick.Item {
bannedProperties: ["layer", "opacity", "smooth", "antialiasing",
"baselineOffset", "focus", "activeFocusOnTab",
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-19.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-19.qml
index 249e27768c..8f8cb78921 100644
--- a/share/qtcreator/qmldesigner/qt4mcu/qul-19.qml
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-19.qml
@@ -4,21 +4,23 @@
VersionData {
name: "Qt for MCUs 1.9"
- bannedItems: ["QtQuick.AnimatedImage",
- "QtQuick.FocusScope",
- "QtQuick.TextInput",
- "QtQuick.TextEdit",
+ bannedItems: [
+ "QtQuick.AnimatedImage",
+ "QtQuick.AnimatedSprite",
"QtQuick.Flow",
+ "QtQuick.FocusScope",
"QtQuick.Grid",
"QtQuick.GridView",
- "QtQuick.PathView",
"QtQuick.Loader",
+ "QtQuick.PathView",
+ "QtQuick.TextEdit",
+ "QtQuick.TextInput",
"QtQuick.Controls",
"QtQuick.Controls.BusyIndicator",
"QtQuick.Controls.ButtonGroup",
"QtQuick.Controls.CheckDelegate",
- "QtQuick.Controls.Container",
"QtQuick.Controls.ComboBox",
+ "QtQuick.Controls.Container",
"QtQuick.Controls.DelayButton",
"QtQuick.Controls.Frame",
"QtQuick.Controls.GroupBox",
@@ -35,25 +37,28 @@ VersionData {
"QtQuick.Controls.StackView",
"QtQuick.Controls.SwipeDelegate",
"QtQuick.Controls.SwitchDelegate",
- "QtQuick.Controls.ToolBar",
- "QtQuick.Controls.ToolButton",
"QtQuick.Controls.TabBar",
"QtQuick.Controls.TabButton",
"QtQuick.Controls.TextArea",
"QtQuick.Controls.TextField",
+ "QtQuick.Controls.ToolBar",
+ "QtQuick.Controls.ToolButton",
"QtQuick.Controls.ToolSeparator",
"QtQuick.Controls.Tumbler",
"QtQuick.Shapes.ConicalGradient",
"QtQuick.Shapes.LinearGradient",
"QtQuick.Shapes.RadialGradient",
- "QtQuick.Shapes.ShapeGradient"]
+ "QtQuick.Shapes.ShapeGradient"
+ ]
- allowedImports: ["QtQuick",
- "QtQuick.Shapes",
+ allowedImports: [
+ "QtQuick",
"QtQuick.Controls",
+ "QtQuick.Shapes",
"QtQuick.Timeline",
"QtQuickUltralite.Extras",
- "QtQuickUltralite.Layers"]
+ "QtQuickUltralite.Layers"
+ ]
bannedImports: ["FlowView"]
@@ -65,6 +70,10 @@ VersionData {
"strikeout", "underline", "styleName"]
}
+ QtQml.Timer {
+ bannedProperties: ["triggeredOnStart"]
+ }
+
QtQuick.Item {
bannedProperties: ["layer", "opacity", "smooth", "antialiasing",
"baselineOffset", "focus", "activeFocusOnTab",
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-20.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-20.qml
index 143d167b93..07bee0e403 100644
--- a/share/qtcreator/qmldesigner/qt4mcu/qul-20.qml
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-20.qml
@@ -4,21 +4,23 @@
VersionData {
name: "Qt for MCUs 2.0"
- bannedItems: ["QtQuick.AnimatedImage",
- "QtQuick.FocusScope",
- "QtQuick.TextInput",
- "QtQuick.TextEdit",
+ bannedItems: [
+ "QtQuick.AnimatedImage",
+ "QtQuick.AnimatedSprite",
"QtQuick.Flow",
+ "QtQuick.FocusScope",
"QtQuick.Grid",
"QtQuick.GridView",
- "QtQuick.PathView",
"QtQuick.Loader",
+ "QtQuick.PathView",
+ "QtQuick.TextEdit",
+ "QtQuick.TextInput",
"QtQuick.Controls",
"QtQuick.Controls.BusyIndicator",
"QtQuick.Controls.ButtonGroup",
"QtQuick.Controls.CheckDelegate",
- "QtQuick.Controls.Container",
"QtQuick.Controls.ComboBox",
+ "QtQuick.Controls.Container",
"QtQuick.Controls.DelayButton",
"QtQuick.Controls.Frame",
"QtQuick.Controls.GroupBox",
@@ -35,25 +37,28 @@ VersionData {
"QtQuick.Controls.StackView",
"QtQuick.Controls.SwipeDelegate",
"QtQuick.Controls.SwitchDelegate",
- "QtQuick.Controls.ToolBar",
- "QtQuick.Controls.ToolButton",
"QtQuick.Controls.TabBar",
"QtQuick.Controls.TabButton",
"QtQuick.Controls.TextArea",
"QtQuick.Controls.TextField",
+ "QtQuick.Controls.ToolBar",
+ "QtQuick.Controls.ToolButton",
"QtQuick.Controls.ToolSeparator",
"QtQuick.Controls.Tumbler",
"QtQuick.Shapes.ConicalGradient",
"QtQuick.Shapes.LinearGradient",
"QtQuick.Shapes.RadialGradient",
- "QtQuick.Shapes.ShapeGradient"]
+ "QtQuick.Shapes.ShapeGradient"
+ ]
- allowedImports: ["QtQuick",
- "QtQuick.Shapes",
+ allowedImports: [
+ "QtQuick",
"QtQuick.Controls",
+ "QtQuick.Shapes",
"QtQuick.Timeline",
"QtQuickUltralite.Extras",
- "QtQuickUltralite.Layers"]
+ "QtQuickUltralite.Layers"
+ ]
bannedImports: ["FlowView"]
@@ -65,6 +70,10 @@ VersionData {
"strikeout", "underline", "styleName"]
}
+ QtQml.Timer {
+ bannedProperties: ["triggeredOnStart"]
+ }
+
QtQuick.Item {
bannedProperties: ["layer", "opacity", "smooth", "antialiasing",
"baselineOffset", "focus", "activeFocusOnTab",
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-21.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-21.qml
index 1d2663b8a5..5f7de7a71f 100644
--- a/share/qtcreator/qmldesigner/qt4mcu/qul-21.qml
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-21.qml
@@ -1,27 +1,26 @@
// Copyright (C) 2021 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-//differences from 2.0:
-//text.elide is introduced in QUL
-
VersionData {
name: "Qt for MCUs 2.1"
- bannedItems: ["QtQuick.AnimatedImage",
- "QtQuick.FocusScope",
- "QtQuick.TextInput",
- "QtQuick.TextEdit",
+ bannedItems: [
+ "QtQuick.AnimatedImage",
+ "QtQuick.AnimatedSprite",
"QtQuick.Flow",
+ "QtQuick.FocusScope",
"QtQuick.Grid",
"QtQuick.GridView",
- "QtQuick.PathView",
"QtQuick.Loader",
+ "QtQuick.PathView",
+ "QtQuick.TextEdit",
+ "QtQuick.TextInput",
"QtQuick.Controls",
"QtQuick.Controls.BusyIndicator",
"QtQuick.Controls.ButtonGroup",
"QtQuick.Controls.CheckDelegate",
- "QtQuick.Controls.Container",
"QtQuick.Controls.ComboBox",
+ "QtQuick.Controls.Container",
"QtQuick.Controls.DelayButton",
"QtQuick.Controls.Frame",
"QtQuick.Controls.GroupBox",
@@ -38,25 +37,28 @@ VersionData {
"QtQuick.Controls.StackView",
"QtQuick.Controls.SwipeDelegate",
"QtQuick.Controls.SwitchDelegate",
- "QtQuick.Controls.ToolBar",
- "QtQuick.Controls.ToolButton",
"QtQuick.Controls.TabBar",
"QtQuick.Controls.TabButton",
"QtQuick.Controls.TextArea",
"QtQuick.Controls.TextField",
+ "QtQuick.Controls.ToolBar",
+ "QtQuick.Controls.ToolButton",
"QtQuick.Controls.ToolSeparator",
"QtQuick.Controls.Tumbler",
"QtQuick.Shapes.ConicalGradient",
"QtQuick.Shapes.LinearGradient",
"QtQuick.Shapes.RadialGradient",
- "QtQuick.Shapes.ShapeGradient"]
+ "QtQuick.Shapes.ShapeGradient"
+ ]
- allowedImports: ["QtQuick",
- "QtQuick.Shapes",
+ allowedImports: [
+ "QtQuick",
"QtQuick.Controls",
+ "QtQuick.Shapes",
"QtQuick.Timeline",
"QtQuickUltralite.Extras",
- "QtQuickUltralite.Layers"]
+ "QtQuickUltralite.Layers"
+ ]
bannedImports: ["FlowView"]
@@ -68,6 +70,10 @@ VersionData {
"strikeout", "underline", "styleName"]
}
+ QtQml.Timer {
+ bannedProperties: ["triggeredOnStart"]
+ }
+
QtQuick.Item {
bannedProperties: ["layer", "opacity", "smooth", "antialiasing",
"baselineOffset", "focus", "activeFocusOnTab",
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-22.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-22.qml
index 8dbf0e0f12..b5c5c924b8 100644
--- a/share/qtcreator/qmldesigner/qt4mcu/qul-22.qml
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-22.qml
@@ -1,28 +1,26 @@
// Copyright (C) 2022 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-//differences from 2.0:
-//2.1: + text.elide
-//2.2: + text.wrapMode
-
VersionData {
name: "Qt for MCUs 2.2"
- bannedItems: ["QtQuick.AnimatedImage",
- "QtQuick.FocusScope",
- "QtQuick.TextInput",
- "QtQuick.TextEdit",
+ bannedItems: [
+ "QtQuick.AnimatedImage",
+ "QtQuick.AnimatedSprite",
"QtQuick.Flow",
+ "QtQuick.FocusScope",
"QtQuick.Grid",
"QtQuick.GridView",
- "QtQuick.PathView",
"QtQuick.Loader",
+ "QtQuick.PathView",
+ "QtQuick.TextEdit",
+ "QtQuick.TextInput",
"QtQuick.Controls",
"QtQuick.Controls.BusyIndicator",
"QtQuick.Controls.ButtonGroup",
"QtQuick.Controls.CheckDelegate",
- "QtQuick.Controls.Container",
"QtQuick.Controls.ComboBox",
+ "QtQuick.Controls.Container",
"QtQuick.Controls.DelayButton",
"QtQuick.Controls.Frame",
"QtQuick.Controls.GroupBox",
@@ -39,25 +37,28 @@ VersionData {
"QtQuick.Controls.StackView",
"QtQuick.Controls.SwipeDelegate",
"QtQuick.Controls.SwitchDelegate",
- "QtQuick.Controls.ToolBar",
- "QtQuick.Controls.ToolButton",
"QtQuick.Controls.TabBar",
"QtQuick.Controls.TabButton",
"QtQuick.Controls.TextArea",
"QtQuick.Controls.TextField",
+ "QtQuick.Controls.ToolBar",
+ "QtQuick.Controls.ToolButton",
"QtQuick.Controls.ToolSeparator",
"QtQuick.Controls.Tumbler",
"QtQuick.Shapes.ConicalGradient",
"QtQuick.Shapes.LinearGradient",
"QtQuick.Shapes.RadialGradient",
- "QtQuick.Shapes.ShapeGradient"]
+ "QtQuick.Shapes.ShapeGradient"
+ ]
- allowedImports: ["QtQuick",
- "QtQuick.Shapes",
+ allowedImports: [
+ "QtQuick",
"QtQuick.Controls",
+ "QtQuick.Shapes",
"QtQuick.Timeline",
"QtQuickUltralite.Extras",
- "QtQuickUltralite.Layers"]
+ "QtQuickUltralite.Layers"
+ ]
bannedImports: ["FlowView"]
@@ -69,6 +70,10 @@ VersionData {
"strikeout", "underline", "styleName"]
}
+ QtQml.Timer {
+ bannedProperties: ["triggeredOnStart"]
+ }
+
QtQuick.Item {
bannedProperties: ["layer", "opacity", "smooth", "antialiasing",
"baselineOffset", "focus", "activeFocusOnTab",
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-23.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-23.qml
new file mode 100644
index 0000000000..0c55d7db3a
--- /dev/null
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-23.qml
@@ -0,0 +1,211 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+VersionData {
+ name: "Qt for MCUs 2.3"
+
+ bannedItems: [
+ "QtQuick.AnimatedImage",
+ "QtQuick.AnimatedSprite",
+ "QtQuick.Flow",
+ "QtQuick.FocusScope",
+ "QtQuick.Grid",
+ "QtQuick.GridView",
+ "QtQuick.PathView",
+ "QtQuick.TextEdit",
+ "QtQuick.TextInput",
+ "QtQuick.Controls",
+ "QtQuick.Controls.BusyIndicator",
+ "QtQuick.Controls.ButtonGroup",
+ "QtQuick.Controls.CheckDelegate",
+ "QtQuick.Controls.ComboBox",
+ "QtQuick.Controls.Container",
+ "QtQuick.Controls.DelayButton",
+ "QtQuick.Controls.Frame",
+ "QtQuick.Controls.GroupBox",
+ "QtQuick.Controls.ItemDelegate",
+ "QtQuick.Controls.Label",
+ "QtQuick.Controls.Page",
+ "QtQuick.Controls.PageIndicator",
+ "QtQuick.Controls.Pane",
+ "QtQuick.Controls.RadioDelegate",
+ "QtQuick.Controls.RangeSlider",
+ "QtQuick.Controls.RoundButton",
+ "QtQuick.Controls.ScrollView",
+ "QtQuick.Controls.SpinBox",
+ "QtQuick.Controls.StackView",
+ "QtQuick.Controls.SwipeDelegate",
+ "QtQuick.Controls.SwitchDelegate",
+ "QtQuick.Controls.TabBar",
+ "QtQuick.Controls.TabButton",
+ "QtQuick.Controls.TextArea",
+ "QtQuick.Controls.TextField",
+ "QtQuick.Controls.ToolBar",
+ "QtQuick.Controls.ToolButton",
+ "QtQuick.Controls.ToolSeparator",
+ "QtQuick.Controls.Tumbler",
+ "QtQuick.Shapes.ConicalGradient",
+ "QtQuick.Shapes.LinearGradient",
+ "QtQuick.Shapes.RadialGradient",
+ "QtQuick.Shapes.ShapeGradient"
+ ]
+
+ allowedImports: [
+ "QtQuick",
+ "QtQuick.Controls",
+ "QtQuick.Shapes",
+ "QtQuick.Timeline",
+ "QtQuickUltralite.Extras",
+ "QtQuickUltralite.Layers"
+ ]
+
+ bannedImports: ["FlowView"]
+
+ //ComplexProperty is not a type, it's just a way to handle bigger props
+ ComplexProperty {
+ prefix: "font"
+ bannedProperties: ["wordSpacing", "letterSpacing", "hintingPreference",
+ "kerning", "preferShaping", "capitalization",
+ "strikeout", "underline", "styleName"]
+ }
+
+ QtQml.Timer {
+ bannedProperties: ["triggeredOnStart"]
+ }
+
+ QtQuick.Item {
+ bannedProperties: ["layer", "opacity", "smooth", "antialiasing",
+ "baselineOffset", "focus", "activeFocusOnTab",
+ "rotation", "scale", "transformOrigin"]
+ }
+
+ QtQuick.Rectangle {
+ bannedProperties: ["gradient", "border"]
+ }
+
+ QtQuick.Flickable {
+ bannedProperties: ["boundsMovement", "flickDeceleration",
+ "leftMargin", "rightMargin", "bottomMargin", "topMargin",
+ "originX", "originY", "pixelAligned", "pressDelay", "synchronousDrag"]
+ }
+
+ QtQuick.MouseArea {
+ bannedProperties: ["propagateComposedEvents", "preventStealing", "cursorShape",
+ "scrollGestureEnabled", "drag", "acceptedButtons", "hoverEnabled"]
+ }
+
+ QtQuick.Image {
+ allowChildren: false
+ allowedProperties: ["rotation", "scale", "transformOrigin"]
+ bannedProperties: ["mirror", "mipmap", "cache", "autoTransform", "asynchronous",
+ "sourceSize", "smooth"]
+ }
+
+ QtQuick.BorderImage {
+ bannedProperties: ["asynchronous", "cache", "currentFrame", "frameCount",
+ "horizontalTileMode", "mirror", "progress", "smooth", "sourceSize",
+ "status", "verticalTileMode"]
+ }
+
+ QtQuick.Text {
+ allowChildren: false
+ allowedProperties: ["rotation", "scale", "transformOrigin"]
+ bannedProperties: ["lineHeight", "lineHeightMode", "style",
+ "styleColor", "minimumPointSize", "minimumPixelSize",
+ "fontSizeMode", "renderType", "renderTypeQuality", "textFormat", "maximumLineCount"]
+ }
+
+ QtQuick.Loader {
+ bannedProperties: ["asynchronous", "progress", "sourceComponent", "status"]
+ }
+
+ //Padding is not an actual item, but rather set of properties in Text
+ Padding {
+ bannedProperties: ["bottomPadding", "topPadding", "leftPadding", "rightPadding"]
+ }
+
+ QtQuick.Column {
+ bannedProperties: ["bottomPadding", "leftPadding", "rightPadding", "topPadding"]
+ }
+
+ QtQuick.Row {
+ bannedProperties: ["bottomPadding", "leftPadding", "rightPadding", "topPadding",
+ "effectiveLayoutDirection", "layoutDirection"]
+ }
+
+ QtQuick.ListView {
+ bannedProperties: ["cacheBuffer", "highlightRangeMode", "highlightMoveDuration",
+ "highlightResizeDuration", "preferredHighlightBegin", "layoutDirection",
+ "preferredHighlightEnd", "highlightFollowsCurrentItem", "keyNavigationWraps",
+ "snapMode", "highlightMoveVelocity", "highlightResizeVelocity"]
+ }
+
+ QtQuick.Animation {
+ bannedProperties: ["paused"]
+ }
+
+ //Quick Controls2 Items and properties:
+
+ QtQuick.Controls.Control {
+ bannedProperties: ["focusPolicy", "hoverEnabled", "wheelEnabled"]
+ }
+
+ QtQuick.Controls.AbstractButton {
+ bannedProperties: ["display", "autoExclusive", "icon"]
+ }
+
+ QtQuick.Controls.ProgressBar {
+ bannedProperties: ["indeterminate"]
+ }
+
+ QtQuick.Controls.Slider {
+ bannedProperties: ["live", "snapMode", "touchDragThreshold"]
+ }
+
+ //Path and Shapes related:
+
+ QtQuick.Path {
+ bannedProperties: ["scale", "pathElements"]
+ }
+
+ QtQuick.PathArc {
+ bannedProperties: ["relativeX", "relativeY"]
+ }
+
+ QtQuick.PathLine {
+ bannedProperties: ["relativeX", "relativeY"]
+ }
+
+ QtQuick.PathMove {
+ bannedProperties: ["relativeX", "relativeY"]
+ }
+
+ QtQuick.PathQuad {
+ bannedProperties: ["relativeX", "relativeY",
+ "relativeControlX", "relativeControlY"]
+ }
+
+ QtQuick.PathCubic {
+ bannedProperties: ["relativeX", "relativeY",
+ "relativeControl1X", "relativeControl1Y",
+ "relativeControl2X", "relativeControl2Y"]
+ }
+
+ QtQuick.PathElement {
+ //nothing
+ }
+
+ QtQuick.PathSvg {
+ //nothing
+ }
+
+ QtQuick.Shapes.Shape {
+ bannedProperties: ["asynchronous", "containsMode", "data",
+ "renderType", "status", "vendorExtensionsEnabled"]
+ }
+
+ QtQuick.Shapes.ShapePath {
+ bannedProperties: ["dashOffset", "dashPattern",
+ "fillGradient", "strokeStyle"]
+ }
+}
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-24.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-24.qml
new file mode 100644
index 0000000000..f78b00b8c6
--- /dev/null
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-24.qml
@@ -0,0 +1,210 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+VersionData {
+ name: "Qt for MCUs 2.4"
+
+ bannedItems: [
+ "QtQuick.AnimatedImage",
+ "QtQuick.Flow",
+ "QtQuick.FocusScope",
+ "QtQuick.Grid",
+ "QtQuick.GridView",
+ "QtQuick.PathView",
+ "QtQuick.TextEdit",
+ "QtQuick.TextInput",
+ "QtQuick.Controls",
+ "QtQuick.Controls.BusyIndicator",
+ "QtQuick.Controls.ButtonGroup",
+ "QtQuick.Controls.CheckDelegate",
+ "QtQuick.Controls.ComboBox",
+ "QtQuick.Controls.Container",
+ "QtQuick.Controls.DelayButton",
+ "QtQuick.Controls.Frame",
+ "QtQuick.Controls.GroupBox",
+ "QtQuick.Controls.ItemDelegate",
+ "QtQuick.Controls.Label",
+ "QtQuick.Controls.Page",
+ "QtQuick.Controls.PageIndicator",
+ "QtQuick.Controls.Pane",
+ "QtQuick.Controls.RadioDelegate",
+ "QtQuick.Controls.RangeSlider",
+ "QtQuick.Controls.RoundButton",
+ "QtQuick.Controls.ScrollView",
+ "QtQuick.Controls.SpinBox",
+ "QtQuick.Controls.StackView",
+ "QtQuick.Controls.SwipeDelegate",
+ "QtQuick.Controls.SwitchDelegate",
+ "QtQuick.Controls.TabBar",
+ "QtQuick.Controls.TabButton",
+ "QtQuick.Controls.TextArea",
+ "QtQuick.Controls.TextField",
+ "QtQuick.Controls.ToolBar",
+ "QtQuick.Controls.ToolButton",
+ "QtQuick.Controls.ToolSeparator",
+ "QtQuick.Controls.Tumbler",
+ "QtQuick.Shapes.ConicalGradient",
+ "QtQuick.Shapes.LinearGradient",
+ "QtQuick.Shapes.RadialGradient",
+ "QtQuick.Shapes.ShapeGradient"
+ ]
+
+ allowedImports: [
+ "QtQuick",
+ "QtQuick.Controls",
+ "QtQuick.Shapes",
+ "QtQuick.Timeline",
+ "QtQuickUltralite.Extras",
+ "QtQuickUltralite.Layers"
+ ]
+
+ bannedImports: ["FlowView"]
+
+ //ComplexProperty is not a type, it's just a way to handle bigger props
+ ComplexProperty {
+ prefix: "font"
+ bannedProperties: ["wordSpacing", "letterSpacing", "hintingPreference",
+ "kerning", "preferShaping", "capitalization",
+ "strikeout", "underline", "styleName"]
+ }
+
+ QtQml.Timer {
+ bannedProperties: ["triggeredOnStart"]
+ }
+
+ QtQuick.Item {
+ bannedProperties: ["layer", "opacity", "smooth", "antialiasing",
+ "baselineOffset", "focus", "activeFocusOnTab",
+ "rotation", "scale", "transformOrigin"]
+ }
+
+ QtQuick.Rectangle {
+ bannedProperties: ["gradient", "border"]
+ }
+
+ QtQuick.Flickable {
+ bannedProperties: ["boundsMovement", "flickDeceleration",
+ "leftMargin", "rightMargin", "bottomMargin", "topMargin",
+ "originX", "originY", "pixelAligned", "pressDelay", "synchronousDrag"]
+ }
+
+ QtQuick.MouseArea {
+ bannedProperties: ["propagateComposedEvents", "preventStealing", "cursorShape",
+ "scrollGestureEnabled", "drag", "acceptedButtons", "hoverEnabled"]
+ }
+
+ QtQuick.Image {
+ allowChildren: false
+ allowedProperties: ["rotation", "scale", "transformOrigin"]
+ bannedProperties: ["mirror", "mipmap", "cache", "autoTransform", "asynchronous",
+ "sourceSize", "smooth"]
+ }
+
+ QtQuick.BorderImage {
+ bannedProperties: ["asynchronous", "cache", "currentFrame", "frameCount",
+ "horizontalTileMode", "mirror", "progress", "smooth", "sourceSize",
+ "status", "verticalTileMode"]
+ }
+
+ QtQuick.Text {
+ allowChildren: false
+ allowedProperties: ["rotation", "scale", "transformOrigin"]
+ bannedProperties: ["lineHeight", "lineHeightMode", "style",
+ "styleColor", "minimumPointSize", "minimumPixelSize",
+ "fontSizeMode", "renderType", "renderTypeQuality", "textFormat", "maximumLineCount"]
+ }
+
+ QtQuick.Loader {
+ bannedProperties: ["asynchronous", "progress", "status"]
+ }
+
+ //Padding is not an actual item, but rather set of properties in Text
+ Padding {
+ bannedProperties: ["bottomPadding", "topPadding", "leftPadding", "rightPadding"]
+ }
+
+ QtQuick.Column {
+ bannedProperties: ["bottomPadding", "leftPadding", "rightPadding", "topPadding"]
+ }
+
+ QtQuick.Row {
+ bannedProperties: ["bottomPadding", "leftPadding", "rightPadding", "topPadding",
+ "effectiveLayoutDirection", "layoutDirection"]
+ }
+
+ QtQuick.ListView {
+ bannedProperties: ["cacheBuffer", "highlightRangeMode", "highlightMoveDuration",
+ "highlightResizeDuration", "preferredHighlightBegin", "layoutDirection",
+ "preferredHighlightEnd", "highlightFollowsCurrentItem", "keyNavigationWraps",
+ "snapMode", "highlightMoveVelocity", "highlightResizeVelocity"]
+ }
+
+ QtQuick.Animation {
+ bannedProperties: ["paused"]
+ }
+
+ //Quick Controls2 Items and properties:
+
+ QtQuick.Controls.Control {
+ bannedProperties: ["focusPolicy", "hoverEnabled", "wheelEnabled"]
+ }
+
+ QtQuick.Controls.AbstractButton {
+ bannedProperties: ["display", "autoExclusive", "icon"]
+ }
+
+ QtQuick.Controls.ProgressBar {
+ bannedProperties: ["indeterminate"]
+ }
+
+ QtQuick.Controls.Slider {
+ bannedProperties: ["live", "snapMode", "touchDragThreshold"]
+ }
+
+ //Path and Shapes related:
+
+ QtQuick.Path {
+ bannedProperties: ["scale", "pathElements"]
+ }
+
+ QtQuick.PathArc {
+ bannedProperties: ["relativeX", "relativeY"]
+ }
+
+ QtQuick.PathLine {
+ bannedProperties: ["relativeX", "relativeY"]
+ }
+
+ QtQuick.PathMove {
+ bannedProperties: ["relativeX", "relativeY"]
+ }
+
+ QtQuick.PathQuad {
+ bannedProperties: ["relativeX", "relativeY",
+ "relativeControlX", "relativeControlY"]
+ }
+
+ QtQuick.PathCubic {
+ bannedProperties: ["relativeX", "relativeY",
+ "relativeControl1X", "relativeControl1Y",
+ "relativeControl2X", "relativeControl2Y"]
+ }
+
+ QtQuick.PathElement {
+ //nothing
+ }
+
+ QtQuick.PathSvg {
+ //nothing
+ }
+
+ QtQuick.Shapes.Shape {
+ bannedProperties: ["asynchronous", "containsMode", "data",
+ "renderType", "status", "vendorExtensionsEnabled"]
+ }
+
+ QtQuick.Shapes.ShapePath {
+ bannedProperties: ["dashOffset", "dashPattern",
+ "fillGradient", "strokeStyle"]
+ }
+}