Merge remote-tracking branch 'origin/5.9' into 5.10

Conflicts:
	src/quicktemplates2/qquicklabel.cpp
	src/quicktemplates2/qquicktextarea.cpp
	src/quicktemplates2/qquicktextfield.cpp

Change-Id: Ibbf6bc48972f58fbc6779a87ac9e2434c56c4db8

2 files changed, 123 insertions, 0 deletions

diff --git a/tests/auto/font/data/listview.qml b/tests/auto/font/data/listview.qml
new file mode 100644
index 00000000..dcd38751
--- /dev/null
+++ b/tests/auto/font/data/listview.qml
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+
+ApplicationWindow {
+    id: window
+    width: 200
+    height: 200
+
+    property alias listView: listView
+
+    font.pixelSize: 55
+
+    ListView {
+        id: listView
+        anchors.fill: parent
+        model: 1
+        delegate: Column {
+            property alias control: control
+            property alias label: label
+            property alias textarea: textarea
+            property alias textfield: textfield
+
+            Control { id: control }
+            Label { id: label }
+            TextArea { id: textarea }
+            TextField { id: textfield }
+        }
+    }
+}
diff --git a/tests/auto/font/tst_font.cpp b/tests/auto/font/tst_font.cpp
index b05cdcd8..660f4baf 100644
--- a/tests/auto/font/tst_font.cpp
+++ b/tests/auto/font/tst_font.cpp
@@ -62,6 +62,9 @@ private slots:
 
     void defaultFont_data();
     void defaultFont();
+
+    void listView_data();
+    void listView();
 };
 
 void tst_font::font_data()
@@ -286,6 +289,47 @@ void tst_font::defaultFont()
     QCOMPARE(actualFont, *expectedFont);
 }
 
+void tst_font::listView_data()
+{
+    QTest::addColumn<QString>("objectName");
+
+    QTest::newRow("Control") << "control";
+    QTest::newRow("Label") << "label";
+    QTest::newRow("TextArea") << "textarea";
+    QTest::newRow("TextField") << "textfield";
+}
+
+void tst_font::listView()
+{
+    QFETCH(QString, objectName);
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.loadUrl(testFileUrl("listview.qml"));
+
+    QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(component.create()));
+    QVERIFY2(!window.isNull(), qPrintable(component.errorString()));
+
+    window->show();
+    QVERIFY(QTest::qWaitForWindowActive(window.data()));
+
+    QQuickItem *listView = window->property("listView").value<QQuickItem *>();
+    QVERIFY(listView);
+
+    QQuickItem *contentItem = listView->property("contentItem").value<QQuickItem *>();
+    QVERIFY(contentItem);
+
+    QVERIFY(QMetaObject::invokeMethod(listView, "forceLayout"));
+
+    QQuickItem *column = contentItem->childItems().value(0);
+    QVERIFY(column);
+
+    QQuickItem *control = column->property(objectName.toUtf8()).value<QQuickItem *>();
+    QVERIFY(control);
+
+    QCOMPARE(control->property("font").value<QFont>().pixelSize(), 55);
+}
+
 QTEST_MAIN(tst_font)
 
 #include "tst_font.moc"