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

Conflicts:
	.qmake.conf

Change-Id: Ie6ad3e9490dcf85bd5deb4c6d7004a4aa8b81433

11 files changed, 153 insertions, 8 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 14860dc0..f3b76771 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -2,3 +2,6 @@ TEMPLATE = subdirs
 SUBDIRS += testplugin controls activeFocusOnTab applicationwindow dialogs \
            extras qquicktreemodeladaptor customcontrolsstyle
 controls.depends = testplugin
+
+# QTBUG-60268
+boot2qt: SUBDIRS -= controls activeFocusOnTab applicationwindow dialogs extras customcontrolsstyle
diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml
index e5c53a52..145c7f14 100644
--- a/tests/auto/controls/data/tst_label.qml
+++ b/tests/auto/controls/data/tst_label.qml
@@ -69,6 +69,17 @@ TestCase {
         label.destroy()
     }
 
+    function test_textPaddings() {
+        var label = Qt.createQmlObject('import QtQuick.Controls 1.2; Label { leftPadding: 2; rightPadding: 2; topPadding: 2; bottomPadding: 2 }', testCase, '');
+
+        compare(label.leftPadding, 2)
+        compare(label.rightPadding, 2)
+        compare(label.topPadding, 2)
+        compare(label.bottomPadding, 2)
+
+        label.destroy()
+    }
+
     function test_activeFocusOnTab() {
         if (Qt.styleHints.tabFocusBehavior != Qt.TabFocusAllControls)
             skip("This function doesn't support NOT iterating all.")
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index 4cff6352..a27cf70e 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -346,7 +346,7 @@ Item {
 
             // drag less than the threshold distance
             mouseMove(control, pt.x + Settings.dragThreshold - 1, pt.y)
-            compare(control.value, 0.5)
+            verify(control.value > 0.5)
 
             // drag over the threshold
             mouseMove(control, pt.x + Settings.dragThreshold + 1, pt.y)
diff --git a/tests/auto/dialogs/tst_dialogs.cpp b/tests/auto/dialogs/tst_dialogs.cpp
index 1f139966..20da6e43 100644
--- a/tests/auto/dialogs/tst_dialogs.cpp
+++ b/tests/auto/dialogs/tst_dialogs.cpp
@@ -87,7 +87,7 @@ void tst_dialogs::dialogImplicitWidth()
     component.loadUrl(testFileUrl("DialogImplicitSize.qml"));
     QObject *created = component.create();
     QScopedPointer<QObject> cleanup(created);
-    QVERIFY(created);
+    QVERIFY2(created, qPrintable(component.errorString()));
 
     QTRY_VERIFY(created->property("width").toInt() >= 400);
     QTRY_VERIFY(created->property("height").toInt() >= minimumHeight + heightMargins);
@@ -100,7 +100,7 @@ void tst_dialogs::dialogContentResize()
     component.loadUrl(testFileUrl("DialogMinimumSize.qml"));
     QObject *created = component.create();
     QScopedPointer<QObject> cleanup(created);
-    QVERIFY(created);
+    QVERIFY2(created, qPrintable(component.errorString()));
 
     QTRY_COMPARE(created->property("width").toInt(), 400);
     QTRY_COMPARE(created->property("height").toInt(), 300);
@@ -121,7 +121,7 @@ void tst_dialogs::fileDialogDefaultModality()
     window->setGeometry(240,240,1024,320);
     window->show();
     QVERIFY(QTest::qWaitForWindowExposed(window));
-    QVERIFY(window->rootObject());
+    QVERIFY2(window->rootObject(), qPrintable(window->errors().value(0).toString()));
 
     // Click to show
     QObject *dlg = qvariant_cast<QObject *>(window->rootObject()->property("fileDialog"));
@@ -167,7 +167,7 @@ void tst_dialogs::fileDialogNonModal()
     window->setGeometry(240,240,1024,320);
     window->show();
     QVERIFY(QTest::qWaitForWindowExposed(window));
-    QVERIFY(window->rootObject());
+    QVERIFY2(window->rootObject(), qPrintable(window->errors().value(0).toString()));
 
     // Click to toggle visibility
     QObject *dlg = qvariant_cast<QObject *>(window->rootObject()->property("fileDialog"));
@@ -196,7 +196,7 @@ void tst_dialogs::fileDialogNameFilters()
     window->setGeometry(240,240,1024,320);
     window->show();
     QVERIFY(QTest::qWaitForWindowExposed(window));
-    QVERIFY(window->rootObject());
+    QVERIFY2(window->rootObject(), qPrintable(window->errors().value(0).toString()));
 
     QObject *dlg = qvariant_cast<QObject *>(window->rootObject()->property("fileDialog"));
     QStringList filters;
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index e9bb857b..0c4a064d 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS = \
     objectcount \
-    statusindicator
+    statusindicator \
+    startup
diff --git a/tests/benchmarks/objectcount/objectcount.pro b/tests/benchmarks/objectcount/objectcount.pro
index f54d72d6..3e7f77e8 100644
--- a/tests/benchmarks/objectcount/objectcount.pro
+++ b/tests/benchmarks/objectcount/objectcount.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = tst_objectcount
 
 QT += quick testlib core-private
-CONFIG += testcase
+CONFIG += benchmark
 osx:CONFIG -= app_bundle
 
 SOURCES += \
diff --git a/tests/benchmarks/startup/gallery.qrc b/tests/benchmarks/startup/gallery.qrc
new file mode 100644
index 00000000..2cabf889
--- /dev/null
+++ b/tests/benchmarks/startup/gallery.qrc
@@ -0,0 +1,13 @@
+<RCC>
+    <qresource prefix="/">
+        <file>timer.qml</file>
+        <file alias="main.qml">../../../examples/quickcontrols/controls/gallery/main.qml</file>
+        <file alias="qml/ButtonPage.qml">../../../examples/quickcontrols/controls/gallery/qml/ButtonPage.qml</file>
+        <file alias="qml/InputPage.qml">../../../examples/quickcontrols/controls/gallery/qml/InputPage.qml</file>
+        <file alias="qml/ProgressPage.qml">../../../examples/quickcontrols/controls/gallery/qml/ProgressPage.qml</file>
+        <file alias="qml/UI.js">../../../examples/quickcontrols/controls/gallery/qml/UI.js</file>
+        <file alias="+android/UI.js">../../../examples/quickcontrols/controls/gallery/qml/+android/UI.js</file>
+        <file alias="+ios/UI.js">../../../examples/quickcontrols/controls/gallery/qml/+ios/UI.js</file>
+        <file alias="+osx/UI.js">../../../examples/quickcontrols/controls/gallery/qml/+osx/UI.js</file>
+    </qresource>
+</RCC>
diff --git a/tests/benchmarks/startup/startup.pro b/tests/benchmarks/startup/startup.pro
new file mode 100644
index 00000000..755fcc8e
--- /dev/null
+++ b/tests/benchmarks/startup/startup.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+TARGET = tst_startup
+
+CONFIG += console
+macos:CONFIG -= app_bundle
+
+SOURCES += \
+    startup_bench.cpp
+
+RESOURCES += \
+    gallery.qrc
+
+include(../../../examples/quickcontrols/controls/shared/shared.pri)
diff --git a/tests/benchmarks/startup/startup_bench.cpp b/tests/benchmarks/startup/startup_bench.cpp
new file mode 100644
index 00000000..4127f8d0
--- /dev/null
+++ b/tests/benchmarks/startup/startup_bench.cpp
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples 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$
+**
+****************************************************************************/
+
+#include "qtquickcontrolsapplication.h"
+#include <QtQml/QQmlApplicationEngine>
+#include <QtCore/QElapsedTimer>
+#include <functional>
+
+int runBenchmark(std::function<int()> f) {
+    {
+        QElapsedTimer t;
+        t.start();
+        int r = f();
+        if (r == 0)
+            printf("%d,", static_cast<int>(t.elapsed()));
+        else
+            return r;
+    }
+
+    {
+        QElapsedTimer t;
+        t.start();
+        int r = f();
+        if (r == 0)
+            printf("%d\n", static_cast<int>(t.elapsed()));
+        else
+            return r;
+    }
+
+    return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+    QtQuickControlsApplication app(argc, argv);
+
+    auto startup = [&app]() {
+        QQmlApplicationEngine engine(QUrl("qrc:/main.qml"));
+        QObject::connect(&engine, &QQmlApplicationEngine::quit,
+                         QCoreApplication::instance(), &QCoreApplication::quit);
+        engine.load(QUrl("qrc:/timer.qml"));
+        if (engine.rootObjects().size() != 2)
+            return -1;
+        return app.exec();
+    };
+
+    return runBenchmark(startup);
+}
diff --git a/tests/benchmarks/startup/timer.qml b/tests/benchmarks/startup/timer.qml
new file mode 100644
index 00000000..a0e9f1c1
--- /dev/null
+++ b/tests/benchmarks/startup/timer.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.2
+
+Timer {
+    running: true
+    interval: 0
+    onTriggered: Qt.quit();
+}
diff --git a/tests/benchmarks/statusindicator/statusindicator.pro b/tests/benchmarks/statusindicator/statusindicator.pro
index d66b5515..3770784a 100644
--- a/tests/benchmarks/statusindicator/statusindicator.pro
+++ b/tests/benchmarks/statusindicator/statusindicator.pro
@@ -1,6 +1,7 @@
 TEMPLATE = app
 TARGET = tst_bench_statusindicator
 QT = core quick testlib
+CONFIG += benchmark
 
 SOURCES += \
     tst_statusindicator.cpp