aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorAleksei German <aleksei.german@qt.io>2020-12-08 16:24:17 +0100
committerAleksei German <aleksei.german@qt.io>2020-12-08 16:29:02 +0000
commit65fb5beb015c78213a1e283584dd5d1c3fdf35ef (patch)
treed260691b348f98ed5dc754c5340b2534118434db /share
parent036e6d9555bd4743da82dd0e92ffa6affaa69df8 (diff)
QmlDesigner: Extend QUL Metadata list
Change-Id: I2dbd3a4325ced09fdcf3667887ec2e67ccf59252 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/BorderImageSpecifics.qml10
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-14.qml7
2 files changed, 15 insertions, 2 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/BorderImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/BorderImageSpecifics.qml
index 2f35517968..8d5a3e772c 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/BorderImageSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/BorderImageSpecifics.qml
@@ -125,6 +125,7 @@ Column {
Label {
text: qsTr("Horizontal tile mode")
+ disabledState: !backendValues.horizontalTileMode.isAvailable
}
SecondColumnLayout {
@@ -134,11 +135,13 @@ Column {
implicitWidth: 180
Layout.fillWidth: true
scope: "BorderImage"
+ enabled: backendValue.isAvailable
}
}
Label {
text: qsTr("Vertical tile mode")
+ disabledState: !backendValues.verticalTileMode.isAvailable
}
SecondColumnLayout {
@@ -148,37 +151,42 @@ Column {
implicitWidth: 180
Layout.fillWidth: true
scope: "BorderImage"
+ enabled: backendValue.isAvailable
}
-
}
Label {
text: qsTr("Source size")
+ disabledState: !backendValues.sourceSize.isAvailable
}
SecondColumnLayout {
Label {
text: "W"
width: 12
+ disabledStateSoft: !backendValues.sourceSize_width.isAvailable
}
SpinBox {
backendValue: backendValues.sourceSize_width
minimumValue: -2000
maximumValue: 2000
+ enabled: backendValue.isAvailable
decimals: 0
}
Label {
text: "H"
width: 12
+ disabledStateSoft: !backendValues.sourceSize_height.isAvailable
}
SpinBox {
backendValue: backendValues.sourceSize_height
minimumValue: -2000
maximumValue: 2000
+ enabled: backendValue.isAvailable
decimals: 0
}
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml
index 8b9ffed3b8..00e4ad790f 100644
--- a/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml
@@ -27,7 +27,6 @@ VersionData {
name: "QUL 1.4"
bannedItems: ["QtQuick.AnimatedImage",
- "QtQuick.BorderImage",
"QtQuick.FocusScope",
"QtQuick.TextInput",
"QtQuick.TextEdit",
@@ -104,6 +103,12 @@ VersionData {
"sourceSize", "smooth"]
}
+ QtQuick.BorderImage {
+ bannedProperties: ["asynchronous", "cache", "currentFrame", "frameCount",
+ "horizontalTileMode", "mirror", "progress", "smooth", "sourceSize",
+ "status", "verticalTileMode"]
+ }
+
QtQuick.Text {
allowChildren: false
allowedProperties: ["rotation", "scale", "transformOrigin"]