aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorAleksei German <aleksei.german@qt.io>2019-08-15 14:05:44 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2019-08-16 11:32:18 +0000
commit79576601dbd7d5cc288216111592091d790085b6 (patch)
tree519d865ccc7ff489962f1948bb018388dff8c91c /share
parenteaf8ccf11840275515deff4a916cd0af9e016cea (diff)
QmlDesigner Fix for Gradient Presets
Change-Id: I1d3d2f61f978c6bfb52ad4ea42f2c6756a2a0483 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml8
1 files changed, 8 insertions, 0 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
index 878d26c15e..15246a4405 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
@@ -533,6 +533,14 @@ Column {
visible: false
function applyPreset() {
+ if (!gradientLine.hasGradient)
+ {
+ if (colorEditor.shapeGradients)
+ gradientLine.gradientTypeName = "LinearGradient"
+ else
+ gradientLine.gradientTypeName = "Gradient"
+ }
+
if (presetList.gradientData.presetType == 0) {
gradientLine.setPresetByID(presetList.gradientData.presetID);
}