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

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

Change-Id: I27f1260b539354e084beb28be78385e57fda63e1

1 files changed, 19 insertions, 2 deletions

diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/controls/data/tst_dialogbuttonbox.qml
index ed181c5b..62789a47 100644
--- a/tests/auto/controls/data/tst_dialogbuttonbox.qml
+++ b/tests/auto/controls/data/tst_dialogbuttonbox.qml
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.2
+import QtQuick 2.12
 import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
 
 TestCase {
     id: testCase
@@ -275,4 +275,21 @@ TestCase {
 
         compare(okButton.width + cancelButton.width, control.availableWidth - control.spacing)
     }
+
+    function test_oneButtonInFixedWidthBox() {
+        var control = createTemporaryObject(buttonBox, testCase,
+            { width: 400, standardButtons: Dialog.Close })
+        verify(control)
+
+        var listView = control.contentItem
+        waitForRendering(listView)
+
+        var button = control.itemAt(0)
+        verify(button)
+
+        // The button should never go outside of the box.
+        var buttonPosInBox = button.mapToItem(control, 0, 0)
+        verify(buttonPosInBox.x >= 0)
+        verify(buttonPosInBox.x + button.width < control.width)
+    }
 }