From 15296cecc9bd9230c4677e39905bcd65ae5d00e1 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Wed, 19 Aug 2020 16:23:25 +0200
Subject: [PATCH] QmlDesigner: Fix property editor template layout

Change-Id: Icc4dd3e1e0daabc98dbfd893e0511a4ac6d07b13
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../BooleanEditorTemplate.template                 | 11 ++++++++---
 .../StringEditorTemplate.template                  | 12 +++++++++---
 .../PropertyTemplates/UrlEditorTemplate.template   | 14 ++++++++++----
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/BooleanEditorTemplate.template b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/BooleanEditorTemplate.template
index b99c3556f81..bb2328042aa 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/BooleanEditorTemplate.template
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/BooleanEditorTemplate.template
@@ -3,7 +3,12 @@ Label {
     tooltip: "%1"
 }
 
-CheckBox {
-    text: backendValues.%2.valueToString
-    backendValue: backendValues.%2
+SecondColumnLayout {
+    CheckBox {
+        text: backendValues.%2.valueToString
+        backendValue: backendValues.%2
+    }
+
+    ExpandingSpacer {
+    }
 }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/StringEditorTemplate.template b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/StringEditorTemplate.template
index 99607dfd269..c53c07288e4 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/StringEditorTemplate.template
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/StringEditorTemplate.template
@@ -2,7 +2,13 @@ Label {
     text: "%1"
     tooltip: "%1"
 }
-LineEdit {
-    backendValue: backendValues.%2
-    Layout.fillWidth: true
+
+SecondColumnLayout {
+    LineEdit {
+        backendValue: backendValues.%2
+        Layout.fillWidth: true
+    }
+
+    ExpandingSpacer {
+    }
 }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/UrlEditorTemplate.template b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/UrlEditorTemplate.template
index 361bedccfbb..1cd24345e28 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/UrlEditorTemplate.template
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/UrlEditorTemplate.template
@@ -2,7 +2,13 @@ Label {
     text: "%1"
     tooltip: "%1"
 }
-UrlChooser {
-    Layout.fillWidth: true
-    backendValue:  backendValues.%2
-}
\ No newline at end of file
+
+SecondColumnLayout {
+    UrlChooser {
+        Layout.fillWidth: true
+        backendValue:  backendValues.%2
+    }
+
+    ExpandingSpacer {
+    }
+}