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

Conflicts:
	src/qml/compiler/qqmltypecompiler.cpp
	src/qml/compiler/qv4isel_moth.cpp
	src/qml/compiler/qv4ssa_p.h
	src/qml/qml/qqmlobjectcreator.cpp

Change-Id: I8bb7fe773d657f908f20ee5e72c2b9bd643f6260

1 files changed, 35 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 942eb67563..8dc3053d89 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -201,6 +201,8 @@ private slots:
     void implicitSize();
     void implicitSizeBinding_data();
     void implicitSizeBinding();
+    void implicitResize_data();
+    void implicitResize();
 
     void negativeDimensions();
 
@@ -6010,6 +6012,39 @@ void tst_qquicktextinput::implicitSizeBinding()
     QCOMPARE(textObject->height(), textObject->implicitHeight());
 }
 
+void tst_qquicktextinput::implicitResize_data()
+{
+    QTest::addColumn<int>("alignment");
+    QTest::newRow("left") << int(Qt::AlignLeft);
+    QTest::newRow("center") << int(Qt::AlignHCenter);
+    QTest::newRow("right") << int(Qt::AlignRight);
+}
+
+void tst_qquicktextinput::implicitResize()
+{
+    QFETCH(int, alignment);
+
+    QQmlComponent component(&engine);
+    component.setData("import QtQuick 2.0\nTextInput { }", QUrl::fromLocalFile(""));
+
+    QScopedPointer<QQuickTextInput> textInput(qobject_cast<QQuickTextInput *>(component.create()));
+    QVERIFY(!textInput.isNull());
+
+    QScopedPointer<QQuickTextInput> textField(qobject_cast<QQuickTextInput *>(component.create()));
+    QVERIFY(!textField.isNull());
+    QQuickTextInputPrivate::get(textField.data())->setImplicitResizeEnabled(false);
+
+    textInput->setWidth(200);
+    textField->setImplicitWidth(200);
+
+    textInput->setHAlign(QQuickTextInput::HAlignment(alignment));
+    textField->setHAlign(QQuickTextInput::HAlignment(alignment));
+
+    textInput->setText("Qt");
+    textField->setText("Qt");
+
+    QCOMPARE(textField->positionToRectangle(0), textInput->positionToRectangle(0));
+}
 
 void tst_qquicktextinput::negativeDimensions()
 {