Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	.qmake.conf
	src/imports/controls/qtquickcontrols2plugin.cpp

Change-Id: I27f1260b539354e084beb28be78385e57fda63e1

1 files changed, 29 insertions, 2 deletions

diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index 963046e4..2ee1db41 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -48,9 +48,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.2
+import QtQuick 2.12
 import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
 
 TestCase {
     id: testCase
@@ -633,4 +634,30 @@ TestCase {
         compare(control.background.height, 100)
     }
 
+    Component {
+        id: layoutComponent
+
+        ColumnLayout {
+            anchors.fill: parent
+
+            property alias textField: textField
+
+            TextField {
+                id: textField
+                placeholderText: "Placeholder"
+                Layout.fillWidth: true
+            }
+        }
+    }
+
+    function test_inLayout() {
+        var layout = createTemporaryObject(layoutComponent, testCase)
+        verify(layout)
+
+        var control = layout.textField
+        verify(control)
+
+        compare(control.width, control.parent.width)
+        compare(control.background.width, control.width)
+    }
 }