aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Gruendl <henning.gruendl@qt.io>2022-01-11 16:13:44 +0100
committerHenning Gründl <henning.gruendl@qt.io>2022-01-12 11:51:35 +0000
commitc3334f105a2ceee67757c7f3f2ef155d5ca97688 (patch)
tree40ad0bc7f48716909e39e5740ac62d31c93d3e92
parent637d1c167b2278f54ce77c42403d802457e3fbbe (diff)
QmlDesigner: Add renderTypeQuality property
* Add renderTypeQuality property in TextExtraSection * Add renderTypeQuality to bannedProperties in all qul files Task-number: QDS-5935 Change-Id: Ie22252a7b19704015834a0e413362ad84179b1e3 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/TextExtrasSection.qml25
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-14.qml2
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-17.qml2
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-18.qml2
-rw-r--r--share/qtcreator/qmldesigner/qt4mcu/qul-19.qml2
5 files changed, 29 insertions, 4 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/TextExtrasSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/TextExtrasSection.qml
index d9dab055e2..b7381d05d7 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/TextExtrasSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/TextExtrasSection.qml
@@ -138,6 +138,31 @@ Section {
}
PropertyLabel {
+ text: qsTr("Render type quality")
+ tooltip: qsTr("Overrides the default rendering type quality for this component.")
+ blockedByTemplate: !root.isBackendValueAvailable("renderTypeQuality")
+ enabled: backendValues.renderType !== undefined
+ ? backendValues.renderType.enumeration === "QtRendering"
+ : false
+ }
+
+ SecondColumnLayout {
+ ComboBox {
+ implicitWidth: StudioTheme.Values.singleControlColumnWidth
+ + StudioTheme.Values.actionIndicatorWidth
+ width: implicitWidth
+ scope: "Text"
+ model: ["DefaultRenderTypeQuality", "LowRenderTypeQuality", "NormalRenderTypeQuality",
+ "HighRenderTypeQuality", "VeryHighRenderTypeQuality"]
+ backendValue: backendValues.renderTypeQuality
+ enabled: root.isBackendValueAvailable("renderTypeQuality")
+ && backendValues.renderType.enumeration === "QtRendering"
+ }
+
+ ExpandingSpacer {}
+ }
+
+ PropertyLabel {
visible: root.showLineHeight
text: qsTr("Line height mode")
tooltip: qsTr("Determines how the line height is specified.")
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml
index cebc31f67c..03110763f5 100644
--- a/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml
@@ -118,7 +118,7 @@ VersionData {
allowedProperties: ["rotation", "scale", "transformOrigin"]
bannedProperties: ["elide", "lineHeight", "lineHeightMode", "wrapMode", "style",
"styleColor", "minimumPointSize", "minimumPixelSize",
- "fontSizeMode", "renderType", "textFormat", "maximumLineCount"]
+ "fontSizeMode", "renderType", "renderTypeQuality", "textFormat", "maximumLineCount"]
}
//Padding is not an actual item, but rather set of properties in Text
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-17.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-17.qml
index b8dc8d3d83..765c54bd9d 100644
--- a/share/qtcreator/qmldesigner/qt4mcu/qul-17.qml
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-17.qml
@@ -120,7 +120,7 @@ VersionData {
allowedProperties: ["rotation", "scale", "transformOrigin"]
bannedProperties: ["elide", "lineHeight", "lineHeightMode", "wrapMode", "style",
"styleColor", "minimumPointSize", "minimumPixelSize",
- "fontSizeMode", "renderType", "textFormat", "maximumLineCount"]
+ "fontSizeMode", "renderType", "renderTypeQuality", "textFormat", "maximumLineCount"]
}
//Padding is not an actual item, but rather set of properties in Text
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-18.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-18.qml
index 5f59109374..4c0cf5d4b9 100644
--- a/share/qtcreator/qmldesigner/qt4mcu/qul-18.qml
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-18.qml
@@ -121,7 +121,7 @@ VersionData {
allowedProperties: ["rotation", "scale", "transformOrigin"]
bannedProperties: ["elide", "lineHeight", "lineHeightMode", "wrapMode", "style",
"styleColor", "minimumPointSize", "minimumPixelSize",
- "fontSizeMode", "renderType", "textFormat", "maximumLineCount"]
+ "fontSizeMode", "renderType", "renderTypeQuality", "textFormat", "maximumLineCount"]
}
//Padding is not an actual item, but rather set of properties in Text
diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-19.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-19.qml
index 3c0c136559..be473bc8ca 100644
--- a/share/qtcreator/qmldesigner/qt4mcu/qul-19.qml
+++ b/share/qtcreator/qmldesigner/qt4mcu/qul-19.qml
@@ -121,7 +121,7 @@ VersionData {
allowedProperties: ["rotation", "scale", "transformOrigin"]
bannedProperties: ["elide", "lineHeight", "lineHeightMode", "wrapMode", "style",
"styleColor", "minimumPointSize", "minimumPixelSize",
- "fontSizeMode", "renderType", "textFormat", "maximumLineCount"]
+ "fontSizeMode", "renderType", "renderTypeQuality", "textFormat", "maximumLineCount"]
}
//Padding is not an actual item, but rather set of properties in Text