Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev

46 files changed, 282 insertions, 511 deletions

diff --git a/tests/auto/particles/qquickparticlesystem/data/crashaffectors.qml b/tests/auto/particles/qquickparticlesystem/data/crashaffectors.qml
index de105916a7..61599adc09 100644
--- a/tests/auto/particles/qquickparticlesystem/data/crashaffectors.qml
+++ b/tests/auto/particles/qquickparticlesystem/data/crashaffectors.qml
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
 ** Copyright (C) 2017 reMarkable A/S
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
index 584bd10151..441f8c113f 100644
--- a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
+++ b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
@@ -46,7 +46,7 @@
 using namespace QV4;
 using namespace QV4::Debugging;
 
-typedef QV4::ReturnedValue (*InjectedFunction)(QV4::CallContext*);
+typedef void (*InjectedFunction)(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData);
 Q_DECLARE_METATYPE(InjectedFunction)
 
 static bool waitForSignal(QObject* obj, const char* signal, int timeout = 10000)
@@ -438,11 +438,11 @@ void tst_qv4debugger::addBreakPointWhilePaused()
     QCOMPARE(state.lineNumber, 2);
 }
 
-static QV4::ReturnedValue someCall(QV4::CallContext *ctx)
+static void someCall(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *)
 {
-    static_cast<QV4Debugger *>(ctx->d()->engine->debugger())
+    static_cast<QV4Debugger *>(scope.engine->debugger())
             ->removeBreakPoint("removeBreakPointForNextInstruction", 2);
-    return QV4::Encode::undefined();
+    RETURN_UNDEFINED();
 }
 
 void tst_qv4debugger::removeBreakPointForNextInstruction()
diff --git a/tests/auto/qml/qqmlconnections/data/disabled-at-start.qml b/tests/auto/qml/qqmlconnections/data/disabled-at-start.qml
new file mode 100644
index 0000000000..1a823f87f6
--- /dev/null
+++ b/tests/auto/qml/qqmlconnections/data/disabled-at-start.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.9
+
+Item {
+    id: root
+
+    property bool tested: false
+    signal testMe()
+
+    Connections {
+        target: root
+        enabled: false
+        onTestMe: root.tested = true;
+    }
+}
diff --git a/tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp b/tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp
index 1ed94fcb93..22e9724c61 100644
--- a/tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp
+++ b/tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp
@@ -52,6 +52,7 @@ private slots:
     void rewriteErrors();
     void singletonTypeTarget();
     void enableDisable_QTBUG_36350();
+    void disabledAtStart();
     void clearImplicitTarget();
     void onWithoutASignal();
 
@@ -354,6 +355,23 @@ void tst_qqmlconnections::enableDisable_QTBUG_36350()
     delete item;
 }
 
+void tst_qqmlconnections::disabledAtStart()
+{
+    QQmlEngine engine;
+    QQmlComponent c(&engine, testFileUrl("disabled-at-start.qml"));
+    QObject * const object = c.create();
+
+    QVERIFY(object != 0);
+
+    QCOMPARE(object->property("tested").toBool(), false);
+    const int index = object->metaObject()->indexOfSignal("testMe()");
+    const QMetaMethod method = object->metaObject()->method(index);
+    method.invoke(object, Qt::DirectConnection);
+    QCOMPARE(object->property("tested").toBool(), false);
+
+    delete object;
+}
+
 //QTBUG-56499
 void tst_qqmlconnections::clearImplicitTarget()
 {
diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
index 3f6107ab2b..07569efc72 100644
--- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
+++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
@@ -36,6 +36,7 @@
 #include <QSignalSpy>
 #include <QDebug>
 #include <QBuffer>
+#include <QCryptographicHash>
 #include <QQmlComponent>
 #include <QQmlNetworkAccessManagerFactory>
 #include <QQmlExpression>
diff --git a/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp b/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp
index 124a107a37..268010ead8 100644
--- a/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp
+++ b/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** 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:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/qml/qqmllanguage/data/ConcurrentLoadA.qml b/tests/auto/qml/qqmllanguage/data/ConcurrentLoadA.qml
new file mode 100644
index 0000000000..3d538c7572
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/ConcurrentLoadA.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0
+import testModule 1.0
+
+Item {
+   Test {}
+}
+
diff --git a/tests/auto/qml/qqmllanguage/data/ConcurrentLoadB.qml b/tests/auto/qml/qqmllanguage/data/ConcurrentLoadB.qml
new file mode 100644
index 0000000000..3d538c7572
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/ConcurrentLoadB.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0
+import testModule 1.0
+
+Item {
+   Test {}
+}
+
diff --git a/tests/auto/qml/qqmllanguage/data/concurrentLoad_main.qml b/tests/auto/qml/qqmllanguage/data/concurrentLoad_main.qml
new file mode 100644
index 0000000000..8cfc90ac96
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/concurrentLoad_main.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.0
+Rectangle {
+ConcurrentLoadA {}
+ConcurrentLoadB {}
+}
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index cc5b8cacbc..15f19d550b 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -267,6 +267,8 @@ private slots:
     void instanceof_data();
     void instanceof();
 
+    void concurrentLoadQmlDir();
+
 private:
     QQmlEngine engine;
     QStringList defaultImportPathList;
@@ -4559,6 +4561,20 @@ void tst_qqmllanguage::instanceof()
     }
 }
 
+void tst_qqmllanguage::concurrentLoadQmlDir()
+{
+    ThreadedTestHTTPServer server(dataDirectory());
+    QString serverdir = server.urlString("/lib/");
+    engine.setImportPathList(QStringList(defaultImportPathList) << serverdir);
+
+    QQmlComponent component(&engine, testFileUrl("concurrentLoad_main.qml"));
+    QTRY_VERIFY(component.isReady());
+    VERIFY_ERRORS(0);
+    QScopedPointer<QObject> o(component.create());
+    QVERIFY(!o.isNull());
+    engine.setImportPathList(defaultImportPathList);
+}
+
 QTEST_MAIN(tst_qqmllanguage)
 
 #include "tst_qqmllanguage.moc"
diff --git a/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp b/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp
index 357482b93f..ba2b836a6d 100644
--- a/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp
+++ b/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp
@@ -49,6 +49,7 @@ private slots:
     void qmlParser_data();
     void qmlParser();
 #endif
+    void invalidEscapeSequence();
 
 private:
     QStringList excludedDirs;
@@ -192,6 +193,17 @@ void tst_qqmlparser::qmlParser()
 }
 #endif
 
+void tst_qqmlparser::invalidEscapeSequence()
+{
+    using namespace QQmlJS;
+
+    Engine engine;
+    Lexer lexer(&engine);
+    lexer.setCode(QLatin1String("\"\\"), 1);
+    Parser parser(&engine);
+    parser.parse();
+}
+
 QTEST_MAIN(tst_qqmlparser)
 
 #include "tst_qqmlparser.moc"
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.qml
index 2abf1c60a8..dd4dd435a5 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.qml
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Canonical Limited and/or its subsidiary(-ies).
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 Canonical Limited and/or its subsidiary(-ies).
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp b/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp
index 63da28b7ba..49135ca920 100644
--- a/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp
+++ b/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp
@@ -250,7 +250,7 @@ void tst_QQuickWorkerScript::scriptError_onLoad()
     QVERIFY(worker != 0);
 
     QTRY_COMPARE(qquickworkerscript_lastWarning,
-            testFileUrl("script_error_onLoad.js").toString() + QLatin1String(":3:10: Expected token `,'"));
+            testFileUrl("script_error_onLoad.js").toString() + QLatin1String(":3:10: SyntaxError: Expected token `,'"));
 
     qInstallMessageHandler(previousMsgHandler);
     qApp->processEvents();
diff --git a/tests/auto/qmltest/statemachine/tst_signaltransition.qml b/tests/auto/qmltest/statemachine/tst_signaltransition.qml
index 0e35207670..a57826855a 100644
--- a/tests/auto/qmltest/statemachine/tst_signaltransition.qml
+++ b/tests/auto/qmltest/statemachine/tst_signaltransition.qml
@@ -1,32 +1,27 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Ford Motor Company
-** Copyright (C) 2016 The Qt Company
+** Copyright (C) 2017 Ford Motor Company
+** Copyright (C) 2017 The Qt Company
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/qmltest/statemachine/tst_triggeredArguments1.qml b/tests/auto/qmltest/statemachine/tst_triggeredArguments1.qml
index 5d2e867da4..34c172aded 100644
--- a/tests/auto/qmltest/statemachine/tst_triggeredArguments1.qml
+++ b/tests/auto/qmltest/statemachine/tst_triggeredArguments1.qml
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Ford Motor Company
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 Ford Motor Company
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/qmltest/statemachine/tst_triggeredArguments2.qml b/tests/auto/qmltest/statemachine/tst_triggeredArguments2.qml
index f60f2ff78c..73bc653404 100644
--- a/tests/auto/qmltest/statemachine/tst_triggeredArguments2.qml
+++ b/tests/auto/qmltest/statemachine/tst_triggeredArguments2.qml
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Ford Motor Company
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 Ford Motor Company
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/quick/qquickanimatedsprite/data/sourceSwitch.qml b/tests/auto/quick/qquickanimatedsprite/data/sourceSwitch.qml
index 18a8f52661..c81a765c7e 100644
--- a/tests/auto/quick/qquickanimatedsprite/data/sourceSwitch.qml
+++ b/tests/auto/quick/qquickanimatedsprite/data/sourceSwitch.qml
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** 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:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/quick/qquickanimators/data/positionerWithAnimator.qml b/tests/auto/quick/qquickanimators/data/positionerWithAnimator.qml
index bfd475266e..bd3b42b397 100644
--- a/tests/auto/quick/qquickanimators/data/positionerWithAnimator.qml
+++ b/tests/auto/quick/qquickanimators/data/positionerWithAnimator.qml
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** 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:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/quick/qquickapplication/BLACKLIST b/tests/auto/quick/qquickapplication/BLACKLIST
deleted file mode 100644
index 81592db56f..0000000000
--- a/tests/auto/quick/qquickapplication/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-[active]
-osx-10.11
diff --git a/tests/auto/quick/qquickfocusscope/BLACKLIST b/tests/auto/quick/qquickfocusscope/BLACKLIST
new file mode 100644
index 0000000000..cc3c8b6e8a
--- /dev/null
+++ b/tests/auto/quick/qquickfocusscope/BLACKLIST
@@ -0,0 +1,2 @@
+[canvasFocus]
+osx-10.11
diff --git a/tests/auto/quick/qquickitem/data/childAtRectangle.qml b/tests/auto/quick/qquickitem/data/childAtRectangle.qml
index d459c2b3f1..2aaaedb06f 100644
--- a/tests/auto/quick/qquickitem/data/childAtRectangle.qml
+++ b/tests/auto/quick/qquickitem/data/childAtRectangle.qml
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** 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:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/quick/qquickitem/data/shortcutOverride.qml b/tests/auto/quick/qquickitem/data/shortcutOverride.qml
index fab9175c17..247b5fea04 100644
--- a/tests/auto/quick/qquickitem/data/shortcutOverride.qml
+++ b/tests/auto/quick/qquickitem/data/shortcutOverride.qml
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** 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:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/auto/quick/qquickitem2/data/nonexistentPropertyConnection.qml b/tests/auto/quick/qquickitem2/data/nonexistentPropertyConnection.qml
new file mode 100644
index 0000000000..ed0632a68a
--- /dev/null
+++ b/tests/auto/quick/qquickitem2/data/nonexistentPropertyConnection.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.4
+
+Item {
+    function hint() {
+    }
+
+    Connections {
+        target: BlaBlaBla
+        onHint: hint();
+    }
+}
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
index cc74b7e07d..09e89ff85f 100644
--- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
@@ -98,6 +98,7 @@ private slots:
     void mapCoordinatesRect();
     void mapCoordinatesRect_data();
     void propertyChanges();
+    void nonexistentPropertyConnection();
     void transforms();
     void transforms_data();
     void childrenRect();
@@ -2612,6 +2613,15 @@ void tst_QQuickItem::propertyChanges()
     delete window;
 }
 
+void tst_QQuickItem::nonexistentPropertyConnection()
+{
+    // QTBUG-56551: don't crash
+    QQmlComponent component(&engine, testFileUrl("nonexistentPropertyConnection.qml"));
+    QObject *o = component.create();
+    QVERIFY(o);
+    delete o;
+}
+
 void tst_QQuickItem::childrenRect()
 {
     QQuickView *window = new QQuickView(0);
diff --git a/tests/auto/quick/qquickwindow/BLACKLIST b/tests/auto/quick/qquickwindow/BLACKLIST
deleted file mode 100644
index 157808fdbf..0000000000
--- a/tests/auto/quick/qquickwindow/BLACKLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-[requestActivate]
-osx-10.11
-[attachedProperty]
-osx-10.11
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index d454f9b7bc..f2eb6a6685 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -375,6 +375,8 @@ private slots:
 
     void testDragEventPropertyPropagation();
 
+    void createTextureFromImage();
+
 private:
     QTouchDevice *touchDevice;
     QTouchDevice *touchDeviceWithVelocity;
@@ -2825,6 +2827,15 @@ void tst_qquickwindow::testDragEventPropertyPropagation()
     }
 }
 
+void tst_qquickwindow::createTextureFromImage()
+{
+    // An invalid image should return a null pointer.
+    QQuickWindow window;
+    window.show();
+    QTest::qWaitForWindowExposed(&window);
+    QVERIFY(!window.createTextureFromImage(QImage()));
+}
+
 QTEST_MAIN(tst_qquickwindow)
 
 #include "tst_qquickwindow.moc"
diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
index 671cefd6f5..39f2961927 100644
--- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp
+++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
@@ -571,7 +571,7 @@ void tst_TouchMouse::buttonOnFlickable()
 
     QQuickWindowPrivate *windowPriv = QQuickWindowPrivate::get(window.data());
     QVERIFY(windowPriv->touchMouseId != -1);
-    auto pointerEvent = QQuickPointerDevice::touchDevices().at(0)->pointerEvent();
+    auto pointerEvent = windowPriv->pointerEventInstance(QQuickPointerDevice::touchDevices().at(0));
     QCOMPARE(pointerEvent->point(0)->grabber(), eventItem1);
     QCOMPARE(window->mouseGrabberItem(), eventItem1);
 
@@ -632,7 +632,7 @@ void tst_TouchMouse::touchButtonOnFlickable()
 
     QQuickWindowPrivate *windowPriv = QQuickWindowPrivate::get(window.data());
     QVERIFY(windowPriv->touchMouseId == -1);
-    auto pointerEvent = QQuickPointerDevice::touchDevices().at(0)->pointerEvent();
+    auto pointerEvent = windowPriv->pointerEventInstance(QQuickPointerDevice::touchDevices().at(0));
     QCOMPARE(pointerEvent->point(0)->grabber(), eventItem2);
     QCOMPARE(window->mouseGrabberItem(), nullptr);
 
@@ -758,7 +758,7 @@ void tst_TouchMouse::buttonOnDelayedPressFlickable()
     // for the touchMouseId to the new grabber.
     QCOMPARE(window->mouseGrabberItem(), flickable);
     QVERIFY(windowPriv->touchMouseId != -1);
-    auto pointerEvent = QQuickPointerDevice::touchDevices().at(0)->pointerEvent();
+    auto pointerEvent = windowPriv->pointerEventInstance(QQuickPointerDevice::touchDevices().at(0));
     QCOMPARE(pointerEvent->point(0)->grabber(), flickable);
 
     QTest::touchEvent(window.data(), device).release(0, p3, window.data());
@@ -1422,7 +1422,6 @@ void tst_TouchMouse::hoverEnabled()
     QSignalSpy exitSpy2(mouseArea2, SIGNAL(exited()));
     QSignalSpy clickSpy2(mouseArea2, SIGNAL(clicked(QQuickMouseEvent *)));
 
-    QPoint p0(50, 50);
     QPoint p1(150, 150);
     QPoint p2(150, 250);
 
@@ -1448,9 +1447,6 @@ void tst_TouchMouse::hoverEnabled()
     QVERIFY(!mouseArea2->hovered());
 
     // ------------------------- Touch click on mouseArea2
-    if (QGuiApplication::platformName().compare(QLatin1String("xcb"), Qt::CaseInsensitive) == 0)
-        QSKIP("hover can be momentarily inconsistent on X11, depending on timing of flushFrameSynchronousEvents with touch and mouse movements (QTBUG-55350)");
-
     QTest::touchEvent(window.data(), device).press(0, p2, window.data());
 
     QVERIFY(mouseArea1->hovered());
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index 5e6bc65815..07a6d5ecaa 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
-SUBDIRS = qml script
+SUBDIRS = qml
 qtConfig(private_tests) {
     qtConfig(opengl(es1|es2)?):SUBDIRS += particles
 }
diff --git a/tests/benchmarks/particles/affectors/affectors.pro b/tests/benchmarks/particles/affectors/affectors.pro
index 3351228a4b..35e1f514cc 100644
--- a/tests/benchmarks/particles/affectors/affectors.pro
+++ b/tests/benchmarks/particles/affectors/affectors.pro
@@ -1,10 +1,10 @@
-CONFIG += benchmark
+# This benchmark is broken, see QTBUG-60621
+#CONFIG += benchmark
+TEMPLATE = app
 TARGET = tst_affectors
 SOURCES += tst_affectors.cpp
 macx:CONFIG -= app_bundle
 
-testDataFiles.files = data
-testDataFiles.path = .
-DEPLOYMENT += testDataFiles
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 QT += quickparticles-private testlib
diff --git a/tests/benchmarks/particles/affectors/tst_affectors.cpp b/tests/benchmarks/particles/affectors/tst_affectors.cpp
index 99d175564b..4c611c6faa 100644
--- a/tests/benchmarks/particles/affectors/tst_affectors.cpp
+++ b/tests/benchmarks/particles/affectors/tst_affectors.cpp
@@ -48,6 +48,11 @@ tst_affectors::tst_affectors()
 {
 }
 
+inline QUrl TEST_FILE(const QString &filename)
+{
+    return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
+}
+
 void tst_affectors::test_basic_data()
 {
     QTest::addColumn<int> ("dt");
@@ -69,7 +74,7 @@ void tst_affectors::test_filtered_data()
 void tst_affectors::test_basic()
 {
     QFETCH(int, dt);
-    QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml");
+    QQuickView* view = createView(TEST_FILE("basic.qml"));
     QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
     //Pretend we're running, but we manually advance the simulation
     system->m_running = true;
@@ -109,7 +114,7 @@ void tst_affectors::test_basic()
 void tst_affectors::test_filtered()
 {
     QFETCH(int, dt);
-    QQuickView* view = createView(QCoreApplication::applicationDirPath() + "/data/filtered.qml");
+    QQuickView* view = createView(TEST_FILE("filtered.qml"));
     QQuickParticleSystem* system = view->rootObject()->findChild<QQuickParticleSystem*>("system");
     //Pretend we're running, but we manually advance the simulation
     system->m_running = true;
diff --git a/tests/benchmarks/particles/emission/emission.pro b/tests/benchmarks/particles/emission/emission.pro
index f6730e60ff..963346ebdd 100644
--- a/tests/benchmarks/particles/emission/emission.pro
+++ b/tests/benchmarks/particles/emission/emission.pro
@@ -1,4 +1,5 @@
-CONFIG += benchmark
+# This benchmark is broken, see QTBUG-60621
+#CONFIG += benchmark
 TARGET = tst_emission
 SOURCES += tst_emission.cpp
 macx:CONFIG -= app_bundle
diff --git a/tests/benchmarks/qml/animation/tst_animation.cpp b/tests/benchmarks/qml/animation/tst_animation.cpp
index 59f5a57f5c..27622ed013 100644
--- a/tests/benchmarks/qml/animation/tst_animation.cpp
+++ b/tests/benchmarks/qml/animation/tst_animation.cpp
@@ -41,8 +41,11 @@ public:
 
 private slots:
     void abstractAnimation();
+
+#if defined(QT_BUILD_INTERNAL)
     void bulkValueAnimator();
     void propertyUpdater();
+#endif
 
     void animationtree_qml();
 
@@ -75,6 +78,7 @@ void tst_animation::abstractAnimation()
     }
 }
 
+#if defined(QT_BUILD_INTERNAL)
 void tst_animation::bulkValueAnimator()
 {
     QBENCHMARK {
@@ -90,6 +94,7 @@ void tst_animation::propertyUpdater()
         delete updater;
     }
 }
+#endif // QT_BUILD_INTERNAL
 
 void tst_animation::animationtree_qml()
 {
diff --git a/tests/benchmarks/qml/js/js.pro b/tests/benchmarks/qml/js/js.pro
index 7711e7130d..b1448d8eb8 100644
--- a/tests/benchmarks/qml/js/js.pro
+++ b/tests/benchmarks/qml/js/js.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 SUBDIRS = \
         qjsengine \
-#        qjsvalue \ ### FIXME: doesn't build
+        qjsvalue \
         qjsvalueiterator \
 
 TRUSTED_BENCHMARKS += \
diff --git a/tests/benchmarks/qml/js/qjsengine/qjsengine.pro b/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
index e49a48f779..c4aba78756 100644
--- a/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
+++ b/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
@@ -1,6 +1,8 @@
+CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_bench_qjsengine
 
 SOURCES += tst_qjsengine.cpp
 
 QT += qml testlib
+macos:CONFIG -= app_bundle
diff --git a/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
index 9da310d976..d13751385c 100644
--- a/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
+++ b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
@@ -324,7 +324,7 @@ void tst_QJSEngine::newQObject()
 {
     newEngine();
     QBENCHMARK {
-        (void)m_engine->newQObject(QCoreApplication::instance());
+        (void)m_engine->newQObject(new QObject);
     }
 }
 
diff --git a/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro b/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
index c646613799..edfb619608 100644
--- a/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
+++ b/tests/benchmarks/qml/js/qjsvalue/qjsvalue.pro
@@ -5,3 +5,4 @@ TARGET = tst_bench_qjsvalue
 SOURCES += tst_qjsvalue.cpp
 
 QT += qml testlib
+macos:CONFIG -= app_bundle
diff --git a/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp b/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp
index 5cb0f2f44b..7488d613e5 100644
--- a/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp
+++ b/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp
@@ -943,7 +943,7 @@ void tst_QJSValue::defineStandardTestValues()
     QTest::newRow("regexp") << m_engine->evaluate("new RegExp('foo')");
     QTest::newRow("error") << m_engine->evaluate("new Error");
 
-    QTest::newRow("qobject") << m_engine->newQObject(this);
+    QTest::newRow("qobject") << m_engine->newQObject(new QObject);
 #if 0 // no qmetaobject
     QTest::newRow("qmetaobject") << m_engine->newQMetaObject(&QJSEngine::staticMetaObject);
 #endif
diff --git a/tests/benchmarks/qml/qml.pro b/tests/benchmarks/qml/qml.pro
index f1fe87e532..437d13c87e 100644
--- a/tests/benchmarks/qml/qml.pro
+++ b/tests/benchmarks/qml/qml.pro
@@ -9,7 +9,7 @@ SUBDIRS += \
            qqmlcomponent \
            qqmlmetaproperty \
            librarymetrics_performance \
-#            script \ ### FIXME: doesn't build
+           script \
            js \
            creation
 
diff --git a/tests/benchmarks/qml/qqmlchangeset/tst_qqmlchangeset.cpp b/tests/benchmarks/qml/qqmlchangeset/tst_qqmlchangeset.cpp
index bbfb52343c..cdbec699dc 100644
--- a/tests/benchmarks/qml/qqmlchangeset/tst_qqmlchangeset.cpp
+++ b/tests/benchmarks/qml/qqmlchangeset/tst_qqmlchangeset.cpp
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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$
 **
diff --git a/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro b/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro
deleted file mode 100644
index 556842af80..0000000000
--- a/tests/benchmarks/qml/qqmldebugtrace/qqmldebugtrace.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG += benchmark
-QT += qml testlib
-TEMPLATE = app
-TARGET = tst_qqmldebugtrace
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qqmldebugtrace.cpp
-
diff --git a/tests/benchmarks/qml/qqmldebugtrace/tst_qqmldebugtrace.cpp b/tests/benchmarks/qml/qqmldebugtrace/tst_qqmldebugtrace.cpp
deleted file mode 100644
index 68b34deb3a..0000000000
--- a/tests/benchmarks/qml/qqmldebugtrace/tst_qqmldebugtrace.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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/QElapsedTimer>
-#include <QObject>
-#include <qtest.h>
-
-class tst_qqmldebugtrace : public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_qqmldebugtrace() {}
-
-private slots:
-    void all();
-    void startElapsed();
-    void doubleElapsed();
-    void trace();
-};
-
-void tst_qqmldebugtrace::all()
-{
-    QBENCHMARK {
-        QElapsedTimer t;
-        t.start();
-        t.nsecsElapsed();
-    }
-}
-
-void tst_qqmldebugtrace::startElapsed()
-{
-    QElapsedTimer t;
-    QBENCHMARK {
-        t.start();
-        t.nsecsElapsed();
-    }
-}
-
-void tst_qqmldebugtrace::doubleElapsed()
-{
-    QElapsedTimer t;
-    t.start();
-    QBENCHMARK {
-        t.nsecsElapsed();
-        t.nsecsElapsed();
-    }
-}
-
-void tst_qqmldebugtrace::trace()
-{
-    QString s("A decent sized string of text here.");
-    QBENCHMARK {
-        QByteArray data;
-        QDataStream ds(&data, QIODevice::WriteOnly);
-        ds << (qint64)100 << (int)5 << (int)5 << s;
-    }
-}
-
-QTEST_MAIN(tst_qqmldebugtrace)
-
-#include "tst_qqmldebugtrace.moc"
diff --git a/tests/benchmarks/qml/script/tst_script.cpp b/tests/benchmarks/qml/script/tst_script.cpp
index 3829f3df6a..a48d6bdec7 100644
--- a/tests/benchmarks/qml/script/tst_script.cpp
+++ b/tests/benchmarks/qml/script/tst_script.cpp
@@ -52,10 +52,8 @@ private slots:
    void property_getter_qmetaproperty();
 #endif
     void property_qobject();
-    void property_qmlobject();
 
     void setproperty_js();
-    void setproperty_qmlobject();
 
     void function_js();
 #if 0
@@ -63,7 +61,6 @@ private slots:
     void function_cpp();
 #endif
     void function_qobject();
-    void function_qmlobject();
 
     void function_args_js();
 #if 0
@@ -71,7 +68,6 @@ private slots:
     void function_args_cpp();
 #endif
     void function_args_qobject();
-    void function_args_qmlobject();
 
     void signal_unconnected();
     void signal_qml();
@@ -178,7 +174,7 @@ void tst_script::property_js()
     }
 }
 
-#if 0
+#if 0 // This requires internal API access in V4
 static QJSValue property_getter_method(QScriptContext *, QJSEngine *engine)
 {
     static int x = 0;
@@ -305,26 +301,6 @@ void tst_script::property_qobject()
     }
 }
 
-void tst_script::property_qmlobject()
-{
-    QQmlEngine qmlengine;
-
-    TestObject to;
-    QV8Engine *engine = QQmlEnginePrivate::getV8Engine(&qmlengine);
-    v8::HandleScope handle_scope;
-    v8::Context::Scope scope(engine->context());
-    QJSValue v = engine->scriptValueFromInternal(engine->qobjectWrapper()->newQObject(&to));
-
-    QJSValueList args;
-    args << v;
-    QJSValue prog = qmlengine.evaluate(PROPERTY_PROGRAM).call(args);
-    prog.call();
-
-    QBENCHMARK {
-        prog.call();
-    }
-}
-
 #define SETPROPERTY_PROGRAM \
     "(function(testObject) { return (function() { " \
     "    for (var ii = 0; ii < 10000; ++ii) { " \
@@ -349,27 +325,6 @@ void tst_script::setproperty_js()
     }
 }
 
-void tst_script::setproperty_qmlobject()
-{
-    QQmlEngine qmlengine;
-
-    TestObject to;
-
-    QV8Engine *engine = QQmlEnginePrivate::getV8Engine(&qmlengine);
-    v8::HandleScope handle_scope;
-    v8::Context::Scope scope(engine->context());
-    QJSValue v = engine->scriptValueFromInternal(engine->qobjectWrapper()->newQObject(&to));
-
-    QJSValueList args;
-    args << v;
-    QJSValue prog = qmlengine.evaluate(SETPROPERTY_PROGRAM).call(args);
-    prog.call();
-
-    QBENCHMARK {
-        prog.call();
-    }
-}
-
 #define FUNCTION_PROGRAM \
     "(function(testObject) { return (function() { " \
     "    var test = 0; " \
@@ -437,27 +392,6 @@ void tst_script::function_qobject()
     }
 }
 
-void tst_script::function_qmlobject()
-{
-    QQmlEngine qmlengine;
-
-    TestObject to;
-
-    QV8Engine *engine = QQmlEnginePrivate::getV8Engine(&qmlengine);
-    v8::HandleScope handle_scope;
-    v8::Context::Scope scope(engine->context());
-    QJSValue v = engine->scriptValueFromInternal(engine->qobjectWrapper()->newQObject(&to));
-
-    QJSValueList args;
-    args << v;
-    QJSValue prog = qmlengine.evaluate(FUNCTION_PROGRAM).call(args);
-    prog.call();
-
-    QBENCHMARK {
-        prog.call();
-    }
-}
-
 #define FUNCTION_ARGS_PROGRAM \
     "(function(testObject) { return (function() { " \
     "    var test = 0; " \
@@ -525,27 +459,6 @@ void tst_script::function_args_qobject()
     }
 }
 
-void tst_script::function_args_qmlobject()
-{
-    QQmlEngine qmlengine;
-
-    TestObject to;
-
-    QV8Engine *engine = QQmlEnginePrivate::getV8Engine(&qmlengine);
-    v8::HandleScope handle_scope;
-    v8::Context::Scope scope(engine->context());
-    QJSValue v = engine->scriptValueFromInternal(engine->qobjectWrapper()->newQObject(&to));
-
-    QJSValueList args;
-    args << v;
-    QJSValue prog = qmlengine.evaluate(FUNCTION_ARGS_PROGRAM).call(args);
-    prog.call();
-
-    QBENCHMARK {
-        prog.call();
-    }
-}
-
 void tst_script::signal_unconnected()
 {
     QQmlEngine engine;
diff --git a/tests/benchmarks/script/qjsvalue/qjsvalue.pro b/tests/benchmarks/script/qjsvalue/qjsvalue.pro
deleted file mode 100644
index 1b39091dea..0000000000
--- a/tests/benchmarks/script/qjsvalue/qjsvalue.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG += benchmark
-TEMPLATE = app
-TARGET = tst_bench_qjsvalue
-INCLUDEPATH += .
-macx:CONFIG -= app_bundle
-CONFIG += release
-
-SOURCES += tst_qjsvalue.cpp
-
-QT += core-private  qml-private testlib
diff --git a/tests/benchmarks/script/qjsvalue/tst_qjsvalue.cpp b/tests/benchmarks/script/qjsvalue/tst_qjsvalue.cpp
deleted file mode 100644
index f1bdb78c7b..0000000000
--- a/tests/benchmarks/script/qjsvalue/tst_qjsvalue.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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 <qtest.h>
-#include <QJSEngine>
-#include <QJSValue>
-
-class tst_QJSValue : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QJSValue() {}
-
-private slots:
-    void fillArray();
-
-    void property();
-
-    void setProperty();
-
-    void call();
-};
-
-void tst_QJSValue::fillArray()
-{
-    QJSEngine eng;
-    static const int ArrayLength = 10000;
-    QJSValue array = eng.newArray(ArrayLength);
-    QBENCHMARK {
-        for (int i = 0; i < ArrayLength; ++i)
-            array.setProperty(i, i);
-    }
-}
-
-void tst_QJSValue::property()
-{
-    QJSEngine eng;
-    QJSValue object = eng.newObject();
-    QString propertyName = QString::fromLatin1("foo");
-    object.setProperty(propertyName, 123);
-    QVERIFY(object.property(propertyName).isNumber());
-    QBENCHMARK {
-        object.property(propertyName);
-    }
-}
-
-void tst_QJSValue::setProperty()
-{
-    QJSEngine eng;
-    QJSValue object = eng.newObject();
-    QString propertyName = QString::fromLatin1("foo");
-    QJSValue value(123);
-    QBENCHMARK {
-        object.setProperty(propertyName, value);
-    }
-}
-
-#define TEST_FUNCTION_SOURCE "(function() { return 123; })"
-
-void tst_QJSValue::call()
-{
-    QJSEngine eng;
-    QJSValue fun = eng.evaluate(TEST_FUNCTION_SOURCE);
-    QVERIFY(fun.isCallable());
-    QJSValueList args;
-    QVERIFY(fun.call(args).isNumber());
-    QBENCHMARK {
-        fun.call(args);
-    }
-}
-
-QTEST_MAIN(tst_QJSValue)
-
-#include "tst_qjsvalue.moc"
diff --git a/tests/benchmarks/script/script.pro b/tests/benchmarks/script/script.pro
deleted file mode 100644
index 37dc03801d..0000000000
--- a/tests/benchmarks/script/script.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-           qjsvalue
diff --git a/tests/manual/v4/v8-bench.js b/tests/manual/v4/v8-bench.js
index 41a04fa29a..bfce6231e4 100644
--- a/tests/manual/v4/v8-bench.js
+++ b/tests/manual/v4/v8-bench.js
@@ -202,6 +202,9 @@ BenchmarkSuite.prototype.NotifyError = function(error) {
 // Runs a single benchmark for at least a second and computes the
 // average time it takes to run a single iteration.
 BenchmarkSuite.prototype.RunSingleBenchmark = function(benchmark, data) {
+  // run the garbage collector, to give more reproducible conditions to each test
+  gc()
+
   function Measure(data) {
     var elapsed = 0;
     var start = new Date();