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

Conflicts:
	src/qml/compiler/qv4codegen.cpp

Change-Id: I3c41b9fc9ba7d41741e4dd400402ae80dd7726d9

11 files changed, 203 insertions, 7 deletions

diff --git a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
index 5d7009e7c8..880e254543 100644
--- a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
+++ b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
@@ -44,7 +44,7 @@ void tst_EcmaScriptTests::runTests_data()
     QTest::addColumn<QString>("qmljsParameter");
 
     QTest::newRow("jit") << QStringLiteral("--jit");
-    // Not passing yet: QTest::newRow("interpreter") << QStringLiteral("--interpret");
+    QTest::newRow("interpreter") << QStringLiteral("--interpret");
 }
 
 void tst_EcmaScriptTests::runTests()
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 59566ad927..12a8bd3829 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -7,6 +7,7 @@ PUBLICTESTS += \
     parserstress \
     qjsvalueiterator \
     qjsonbinding \
+    qqmlfile \
 
 !boot2qt {
 PUBLICTESTS += \
diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
index 07569efc72..dac6ddaebd 100644
--- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
+++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
@@ -41,6 +41,7 @@
 #include <QQmlNetworkAccessManagerFactory>
 #include <QQmlExpression>
 #include <QQmlIncubationController>
+#include <QTemporaryDir>
 #include <private/qqmlengine_p.h>
 #include <QQmlAbstractUrlInterceptor>
 
@@ -51,6 +52,7 @@ public:
     tst_qqmlengine() {}
 
 private slots:
+    void initTestCase() override;
     void rootContext();
     void networkAccessManager();
     void synchronousNetworkAccessManager();
@@ -80,8 +82,17 @@ public slots:
         static QObject *ptr = new QObject();
         return ptr;
     }
+
+private:
+    QTemporaryDir m_tempDir;
 };
 
+void tst_qqmlengine::initTestCase()
+{
+    QVERIFY2(m_tempDir.isValid(), qPrintable(m_tempDir.errorString()));
+    QQmlDataTest::initTestCase();
+}
+
 void tst_qqmlengine::rootContext()
 {
     QQmlEngine engine;
@@ -286,9 +297,12 @@ void tst_qqmlengine::clearComponentCache()
 {
     QQmlEngine engine;
 
+    const QString fileName = m_tempDir.filePath(QStringLiteral("temp.qml"));
+    const QUrl fileUrl = QUrl::fromLocalFile(fileName);
+
     // Create original qml file
     {
-        QFile file("temp.qml");
+        QFile file(fileName);
         QVERIFY(file.open(QIODevice::WriteOnly));
         file.write("import QtQuick 2.0\nQtObject {\nproperty int test: 10\n}\n");
         file.close();
@@ -296,7 +310,7 @@ void tst_qqmlengine::clearComponentCache()
 
     // Test "test" property
     {
-        QQmlComponent component(&engine, "temp.qml");
+        QQmlComponent component(&engine, fileUrl);
         QObject *obj = component.create();
         QVERIFY(obj != 0);
         QCOMPARE(obj->property("test").toInt(), 10);
@@ -311,7 +325,7 @@ void tst_qqmlengine::clearComponentCache()
         // Similar effects of lacking precision have been observed on some Linux systems.
         QThread::sleep(1);
 
-        QFile file("temp.qml");
+        QFile file(fileName);
         QVERIFY(file.open(QIODevice::WriteOnly));
         file.write("import QtQuick 2.0\nQtObject {\nproperty int test: 11\n}\n");
         file.close();
@@ -319,7 +333,7 @@ void tst_qqmlengine::clearComponentCache()
 
     // Test cache hit
     {
-        QQmlComponent component(&engine, "temp.qml");
+        QQmlComponent component(&engine, fileUrl);
         QObject *obj = component.create();
         QVERIFY(obj != 0);
         QCOMPARE(obj->property("test").toInt(), 10);
@@ -331,12 +345,18 @@ void tst_qqmlengine::clearComponentCache()
 
     // Test cache refresh
     {
-        QQmlComponent component(&engine, "temp.qml");
+        QQmlComponent component(&engine, fileUrl);
         QObject *obj = component.create();
         QVERIFY(obj != 0);
         QCOMPARE(obj->property("test").toInt(), 11);
         delete obj;
     }
+
+    // Regular Synchronous loading will leave us with an event posted
+    // to the gui thread and an extra refcount that will only be dropped after the
+    // event delivery. Call sendPostedEvents() to get rid of it so that
+    // the temporary directory can be removed.
+    QCoreApplication::sendPostedEvents();
 }
 
 struct ComponentCacheFunctions : public QObject, public QQmlIncubationController
diff --git a/tests/auto/qml/qqmlfile/qqmlfile.pro b/tests/auto/qml/qqmlfile/qqmlfile.pro
new file mode 100644
index 0000000000..ab66792445
--- /dev/null
+++ b/tests/auto/qml/qqmlfile/qqmlfile.pro
@@ -0,0 +1,5 @@
+CONFIG   += testcase
+TARGET = tst_qqmlfile
+SOURCES += tst_qqmlfile.cpp
+macos:CONFIG -= app_bundle
+QT       += qml testlib
diff --git a/tests/auto/qml/qqmlfile/tst_qqmlfile.cpp b/tests/auto/qml/qqmlfile/tst_qqmlfile.cpp
new file mode 100644
index 0000000000..a1c8daddcf
--- /dev/null
+++ b/tests/auto/qml/qqmlfile/tst_qqmlfile.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** 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:GPL-EXCEPT$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <QtTest>
+#include <QQmlFile>
+
+class tst_qqmlfile : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_qqmlfile() {}
+
+private Q_SLOTS:
+    void urlToLocalFileOrQrcOverloads();
+};
+
+
+void tst_qqmlfile::urlToLocalFileOrQrcOverloads()
+{
+    const QString urlString = QStringLiteral("qrc:///example.qml");
+    const QUrl url(urlString);
+    const QString pathForUrlString = QQmlFile::urlToLocalFileOrQrc(urlString);
+    const QString pathForUrl = QQmlFile::urlToLocalFileOrQrc(url);
+
+    QCOMPARE(pathForUrlString, pathForUrl);
+    QCOMPARE(pathForUrlString, QStringLiteral(":/example.qml"));
+}
+
+QTEST_GUILESS_MAIN(tst_qqmlfile)
+
+#include "tst_qqmlfile.moc"
diff --git a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
index 163ce11cb8..ce52afc862 100644
--- a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
+++ b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
@@ -1486,7 +1486,7 @@ void tst_qqmlvaluetypes::groupedInterceptors()
 
     QQmlComponent component(&engine, testFileUrl(qmlfile));
     QObject *object = component.create();
-    QVERIFY(object != 0);
+    QVERIFY2(object != nullptr, qPrintable(component.errorString()));
 
     QColor initialColor = object->property("color").value<QColor>();
     QVERIFY(fuzzyCompare(initialColor.redF(), expectedInitialColor.redF()));
diff --git a/tests/auto/qmltest/url/tst_url.qml b/tests/auto/qmltest/url/tst_url.qml
new file mode 100644
index 0000000000..ff41bd5070
--- /dev/null
+++ b/tests/auto/qmltest/url/tst_url.qml
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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.2
+import QtTest 1.1
+
+Item {
+    TestCase {
+        name: "URL"
+        property url path1: "path1"
+        property url path2: "path2"
+
+        function test_url_compare() {
+            expectFail("", "compare() should fail here; if it passes we have QTBUG-61297")
+            compare(path1, path2)
+        }
+        function test_url_compare_string() {
+            expectFail("", "compare() should fail here")
+            compare(path1.toString(), path2.toString())
+        }
+        function test_url_verify() {
+            verify(path1 != path2)
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickgridview/data/releaseItems.qml b/tests/auto/quick/qquickgridview/data/releaseItems.qml
new file mode 100644
index 0000000000..19d58550a4
--- /dev/null
+++ b/tests/auto/quick/qquickgridview/data/releaseItems.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+
+GridView {
+    width: 400
+    height: 400
+    model: 100
+    delegate: Rectangle {
+        height: 100; width: 100
+        color: index % 2 ? "lightsteelblue" : "lightgray"
+    }
+    contentHeight: contentItem.children.length * 40
+}
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index 1acc36c9b0..b2d6584701 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -209,6 +209,7 @@ private slots:
     void QTBUG_48870_fastModelUpdates();
 
     void keyNavigationEnabled();
+    void releaseItems();
 
 private:
     QList<int> toIntList(const QVariantList &list);
@@ -6666,6 +6667,18 @@ void tst_QQuickGridView::QTBUG_48870_fastModelUpdates()
     }
 }
 
+void tst_QQuickGridView::releaseItems()
+{
+    QScopedPointer<QQuickView> view(createView());
+    view->setSource(testFileUrl("releaseItems.qml"));
+
+    QQuickGridView *gridview = qobject_cast<QQuickGridView *>(view->rootObject());
+    QVERIFY(gridview);
+
+    // don't crash (QTBUG-61294)
+    gridview->setModel(123);
+}
+
 QTEST_MAIN(tst_QQuickGridView)
 
 #include "tst_qquickgridview.moc"
diff --git a/tests/auto/quick/qquicklistview/data/releaseItems.qml b/tests/auto/quick/qquicklistview/data/releaseItems.qml
new file mode 100644
index 0000000000..de774e5e08
--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/releaseItems.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+
+ListView {
+    width: 400
+    height: 400
+    model: 100
+    delegate: Rectangle {
+        height: 40; width: 400
+        color: index % 2 ? "lightsteelblue" : "lightgray"
+    }
+    contentHeight: contentItem.children.length * 40
+}
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index ff06c1e1a4..98c628068d 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -254,6 +254,7 @@ private slots:
     void keyNavigationEnabled();
     void QTBUG_50097_stickyHeader_positionViewAtIndex();
     void itemFiltered();
+    void releaseItems();
 
 private:
     template <class T> void items(const QUrl &source);
@@ -8508,6 +8509,18 @@ void tst_QQuickListView::itemFiltered()
     model.setData(model.index(2), QStringLiteral("modified three"), Qt::DisplayRole);
 }
 
+void tst_QQuickListView::releaseItems()
+{
+    QScopedPointer<QQuickView> view(createView());
+    view->setSource(testFileUrl("releaseItems.qml"));
+
+    QQuickListView *listview = qobject_cast<QQuickListView *>(view->rootObject());
+    QVERIFY(listview);
+
+    // don't crash (QTBUG-61294)
+    listview->setModel(123);
+}
+
 QTEST_MAIN(tst_QQuickListView)
 
 #include "tst_qquicklistview.moc"