From 0bcdc93e198aee53838a6315c11a82a483d0ad1b Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 12 Jun 2019 16:10:23 +0200
Subject: [PATCH] QmlDesigner: Fix layout in templates

Because the templates did not use the pre-defined layout,
the layout was bit broken.

Change-Id: I3a11e78a8dd6ac81252fa51270de5d427e5de0c2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../IntEditorTemplate.template                | 18 ++++++++++------
 .../RealEditorTemplate.template               | 21 ++++++++++++-------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/IntEditorTemplate.template b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/IntEditorTemplate.template
index bd5a899d95a..981340e4cd1 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/IntEditorTemplate.template
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/IntEditorTemplate.template
@@ -2,10 +2,16 @@ Label {
     text: "%1"
     tooltip: "%1"
 }
-SpinBox {
-    maximumValue: 9999999
-    minimumValue: -9999999
-    backendValue: backendValues.%2
-    Layout.fillWidth: true
-    Layout.maximumWidth: 100
+
+SecondColumnLayout {
+    SpinBox {
+        maximumValue: 9999999
+        minimumValue: -9999999
+        backendValue: backendValues.%2
+        Layout.fillWidth: true
+        Layout.maximumWidth: 100
+    }
+
+    ExpandingSpacer {
+    }
 }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/RealEditorTemplate.template b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/RealEditorTemplate.template
index d2a259c80e6..fbc24990c87 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/RealEditorTemplate.template
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/RealEditorTemplate.template
@@ -2,12 +2,17 @@ Label {
     text: "%1"
     tooltip: "%1"
 }
-SpinBox {
-    maximumValue: 9999999
-    minimumValue: -9999999
-    decimals: 2
-    stepSize: 0.1
-    backendValue: backendValues.%2
-    Layout.fillWidth: true
-    Layout.maximumWidth: 100
+
+SecondColumnLayout {
+    SpinBox {
+        maximumValue: 9999999
+        minimumValue: -9999999
+        decimals: 2
+        stepSize: 0.1
+        backendValue: backendValues.%2
+        Layout.fillWidth: true
+        Layout.maximumWidth: 100
+    }
+    ExpandingSpacer {
+    }
 }