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

Conflicts:
	src/qml/compiler/qv4codegen.cpp
	src/qml/compiler/qv4compileddata.cpp
	src/qml/compiler/qv4compileddata_p.h
	src/qml/compiler/qv4isel_moth_p.h
	src/qml/compiler/qv4ssa.cpp
	src/qml/jit/qv4assembler_p.h
	src/qml/jit/qv4isel_masm_p.h
	src/qml/jit/qv4regalloc.cpp
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4qmlcontext_p.h
	src/qml/jsruntime/qv4regexp.cpp
	src/qml/jsruntime/qv4regexp_p.h
	src/qml/jsruntime/qv4regexpobject.cpp
	src/qml/jsruntime/qv4runtime.cpp
	src/qml/jsruntime/qv4vme_moth.cpp
	src/qml/qml/v8/qqmlbuiltinfunctions.cpp
	tests/auto/qml/qml.pro
	tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
	tools/qmlcachegen/qmlcachegen.cpp

Change-Id: I1577e195c736f3414089036b957a01cb91a3ca23

32 files changed, 656 insertions, 57 deletions

diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index 6232a8a867..cc6083cb98 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -36,6 +36,9 @@
 #include <QtTest/qtest.h>
 #include <QtCore/qlibraryinfo.h>
 
+#include <QtGui/private/qguiapplication_p.h>
+#include <QtGui/qpa/qplatformintegration.h>
+
 struct QQmlProfilerData
 {
     QQmlProfilerData(qint64 time = -2, int messageType = -1, int detailType = -1,
@@ -584,16 +587,18 @@ void tst_QQmlProfilerService::scenegraphData()
     qint64 contextFrameTime = -1;
     qint64 renderFrameTime = -1;
 #if QT_CONFIG(opengl) //Software renderer doesn't have context frames
-    foreach (const QQmlProfilerData &msg, m_client->asynchronousMessages) {
-        if (msg.messageType == QQmlProfilerDefinitions::SceneGraphFrame) {
-            if (msg.detailType == QQmlProfilerDefinitions::SceneGraphContextFrame) {
-                contextFrameTime = msg.time;
-                break;
+    if (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL)) {
+        foreach (const QQmlProfilerData &msg, m_client->asynchronousMessages) {
+            if (msg.messageType == QQmlProfilerDefinitions::SceneGraphFrame) {
+                if (msg.detailType == QQmlProfilerDefinitions::SceneGraphContextFrame) {
+                    contextFrameTime = msg.time;
+                    break;
+                }
             }
         }
-    }
 
-    QVERIFY(contextFrameTime != -1);
+        QVERIFY(contextFrameTime != -1);
+    }
 #endif
     foreach (const QQmlProfilerData &msg, m_client->asynchronousMessages) {
         if (msg.detailType == QQmlProfilerDefinitions::SceneGraphRendererFrame) {
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index a3a2efd565..446f9b04a7 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -145,6 +145,7 @@ private slots:
     void array_join_QTBUG_53672();
 
     void regexpLastMatch();
+    void regexpLastIndex();
     void indexedAccesses();
 
     void prototypeChainGc();
@@ -3289,6 +3290,28 @@ void tst_QJSEngine::regexpLastMatch()
 
 }
 
+void tst_QJSEngine::regexpLastIndex()
+{
+    QJSEngine eng;
+    QJSValue result;
+    result = eng.evaluate("function test(text, rx) {"
+                          "    var res;"
+                          "    while (res = rx.exec(text)) { "
+                          "        return true;"
+                          "    }"
+                          "    return false;"
+                          " }"
+                          "function tester(text) {"
+                          "    return test(text, /,\\s*/g);"
+                          "}");
+    QVERIFY(!result.isError());
+
+    result = eng.evaluate("tester(\",  \\n\");");
+    QVERIFY(result.toBool());
+    result = eng.evaluate("tester(\",  \\n\");");
+    QVERIFY(result.toBool());
+}
+
 void tst_QJSEngine::indexedAccesses()
 {
     QJSEngine engine;
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 9790f09d3e..a1180e12df 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -9,7 +9,6 @@ PUBLICTESTS += \
     qjsonbinding \
     qqmlfile \
 
-!boot2qt {
 PUBLICTESTS += \
     qmlmin \
     qqmlcomponent \
@@ -31,14 +30,12 @@ PUBLICTESTS += \
     qqmlsettings \
     qqmlstatemachine \
     qmldiskcache
-}
 
 PRIVATETESTS += \
     qqmlcpputils \
     qqmldirparser \
     qmlcachegen
 
-!boot2qt {
 PRIVATETESTS += \
     animation \
     qqmlecmascript \
@@ -73,19 +70,21 @@ PRIVATETESTS += \
     qv4mm \
     ecmascripttests \
     bindingdependencyapi
-}
 
 qtHaveModule(widgets) {
     PUBLICTESTS += \
         qjsengine \
-        qjsvalue
+        qjsvalue \
+        qwidgetsinqml
 }
 
 SUBDIRS += $$PUBLICTESTS
 SUBDIRS += $$METATYPETESTS
-qtConfig(process):!boot2qt {
+qtConfig(process) {
 #    !contains(QT_CONFIG, no-qml-debug): SUBDIRS += debugger
-    SUBDIRS += qmllint qmlplugindump
+    !boot2qt {
+        SUBDIRS += qmllint qmlplugindump
+    }
 }
 
 qtConfig(library) {
diff --git a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
index 1f80ff46d0..7e81df93b9 100644
--- a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
+++ b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
@@ -44,6 +44,7 @@ private slots:
     void loadGeneratedFile();
     void translationExpressionSupport();
     void signalHandlerParameters();
+    void errorOnArgumentsInSignalHandler();
 };
 
 // A wrapper around QQmlComponent to ensure the temporary reference counts
@@ -68,15 +69,20 @@ public:
     }
 };
 
-static bool generateCache(const QString &qmlFileName)
+static bool generateCache(const QString &qmlFileName, QByteArray *capturedStderr = nullptr)
 {
     QProcess proc;
-    proc.setProcessChannelMode(QProcess::ForwardedChannels);
+    if (capturedStderr == nullptr)
+        proc.setProcessChannelMode(QProcess::ForwardedChannels);
     proc.setProgram(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator() + QLatin1String("qmlcachegen"));
     proc.setArguments(QStringList() << (QLatin1String("--target-architecture=") + QSysInfo::buildCpuArchitecture()) << (QLatin1String("--target-abi=") + QSysInfo::buildAbi()) << qmlFileName);
     proc.start();
     if (!proc.waitForFinished())
         return false;
+
+    if (capturedStderr)
+        *capturedStderr = proc.readAllStandardError();
+
     if (proc.exitStatus() != QProcess::NormalExit)
         return false;
     return proc.exitCode() == 0;
@@ -194,6 +200,31 @@ void tst_qmlcachegen::signalHandlerParameters()
     QCOMPARE(obj->property("result").toInt(), 42);
 }
 
+void tst_qmlcachegen::errorOnArgumentsInSignalHandler()
+{
+    QTemporaryDir tempDir;
+    QVERIFY(tempDir.isValid());
+
+    const auto writeTempFile = [&tempDir](const QString &fileName, const char *contents) {
+        QFile f(tempDir.path() + '/' + fileName);
+        const bool ok = f.open(QIODevice::WriteOnly | QIODevice::Truncate);
+        Q_ASSERT(ok);
+        f.write(contents);
+        return f.fileName();
+    };
+
+    const QString testFilePath = writeTempFile("test.qml", "import QtQml 2.2\n"
+                                                           "QtObject {\n"
+                                                           "    signal mySignal(var arguments);\n"
+                                                           "    onMySignal: console.log(arguments);\n"
+                                                           "}");
+
+
+    QByteArray errorOutput;
+    QVERIFY(!generateCache(testFilePath, &errorOutput));
+    QVERIFY2(errorOutput.contains("error: The use of the arguments object in signal handlers is"), errorOutput);
+}
+
 QTEST_GUILESS_MAIN(tst_qmlcachegen)
 
 #include "tst_qmlcachegen.moc"
diff --git a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
index a285d13001..cdc9f29aab 100644
--- a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
+++ b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
@@ -58,6 +58,7 @@ private slots:
     void cacheResources();
     void stableOrderOfDependentCompositeTypes();
     void singletonDependency();
+    void cppRegisteredSingletonDependency();
 };
 
 // A wrapper around QQmlComponent to ensure the temporary reference counts
@@ -792,6 +793,66 @@ void tst_qmldiskcache::singletonDependency()
     }
 }
 
+void tst_qmldiskcache::cppRegisteredSingletonDependency()
+{
+    qmlClearTypeRegistrations();
+    QScopedPointer<QQmlEngine> engine(new QQmlEngine);
+
+    QTemporaryDir tempDir;
+    QVERIFY(tempDir.isValid());
+
+    const auto writeTempFile = [&tempDir](const QString &fileName, const char *contents) {
+        QFile f(tempDir.path() + '/' + fileName);
+        const bool ok = f.open(QIODevice::WriteOnly | QIODevice::Truncate);
+        Q_ASSERT(ok);
+        f.write(contents);
+        return f.fileName();
+    };
+
+    writeTempFile("MySingleton.qml", "import QtQml 2.0\npragma Singleton\nQtObject { property int value: 42 }");
+
+    qmlRegisterSingletonType(QUrl::fromLocalFile(tempDir.path() + QLatin1String("/MySingleton.qml")), "CppRegisteredSingletonDependency", 1, 0, "Singly");
+
+    const QString testFilePath = writeTempFile("main.qml", "import QtQml 2.0\nimport CppRegisteredSingletonDependency 1.0\nQtObject {\n"
+                                                           "    function getValue() { return Singly.value; }\n"
+                                                           "}");
+
+    {
+        CleanlyLoadingComponent component(engine.data(), QUrl::fromLocalFile(testFilePath));
+        QScopedPointer<QObject> obj(component.create());
+        QVERIFY(!obj.isNull());
+        QVariant value;
+        QVERIFY(QMetaObject::invokeMethod(obj.data(), "getValue", Q_RETURN_ARG(QVariant, value)));
+        QCOMPARE(value.toInt(), 42);
+    }
+
+    const QString testFileCachePath = testFilePath + QLatin1Char('c');
+    QVERIFY(QFile::exists(testFileCachePath));
+    QDateTime initialCacheTimeStamp = QFileInfo(testFileCachePath).lastModified();
+
+    engine.reset(new QQmlEngine);
+    waitForFileSystem();
+
+    writeTempFile("MySingleton.qml", "import QtQml 2.0\npragma Singleton\nQtObject { property int value: 100 }");
+    waitForFileSystem();
+
+    {
+        CleanlyLoadingComponent component(engine.data(), QUrl::fromLocalFile(testFilePath));
+        QScopedPointer<QObject> obj(component.create());
+        QVERIFY(!obj.isNull());
+
+        {
+            QVERIFY(QFile::exists(testFileCachePath));
+            QDateTime newCacheTimeStamp = QFileInfo(testFileCachePath).lastModified();
+            QVERIFY2(newCacheTimeStamp > initialCacheTimeStamp, qPrintable(newCacheTimeStamp.toString()));
+        }
+
+        QVariant value;
+        QVERIFY(QMetaObject::invokeMethod(obj.data(), "getValue", Q_RETURN_ARG(QVariant, value)));
+        QCOMPARE(value.toInt(), 100);
+    }
+}
+
 QTEST_MAIN(tst_qmldiskcache)
 
 #include "tst_qmldiskcache.moc"
diff --git a/tests/auto/qml/qmlmin/qmlmin.pro b/tests/auto/qml/qmlmin/qmlmin.pro
index 6af6653270..93e5caabcf 100644
--- a/tests/auto/qml/qmlmin/qmlmin.pro
+++ b/tests/auto/qml/qmlmin/qmlmin.pro
@@ -6,5 +6,7 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qmlmin.cpp
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
-
-cross_compile: DEFINES += QTEST_CROSS_COMPILED
+# Boot2qt is cross compiled but it has sources available
+!boot2qt {
+   cross_compile: DEFINES += QTEST_CROSS_COMPILED
+}
diff --git a/tests/auto/qml/qmlplugindump/tests/dumper/CompositeSingleton/Singleton.qml b/tests/auto/qml/qmlplugindump/data/dumper/CompositeSingleton/Singleton.qml
index b47d2e98f4..b47d2e98f4 100644
--- a/tests/auto/qml/qmlplugindump/tests/dumper/CompositeSingleton/Singleton.qml
+++ b/tests/auto/qml/qmlplugindump/data/dumper/CompositeSingleton/Singleton.qml
diff --git a/tests/auto/qml/qmlplugindump/tests/dumper/CompositeSingleton/qmldir b/tests/auto/qml/qmlplugindump/data/dumper/CompositeSingleton/qmldir
index 8df57f6d47..8df57f6d47 100644
--- a/tests/auto/qml/qmlplugindump/tests/dumper/CompositeSingleton/qmldir
+++ b/tests/auto/qml/qmlplugindump/data/dumper/CompositeSingleton/qmldir
diff --git a/tests/auto/qml/qmlplugindump/qmlplugindump.pro b/tests/auto/qml/qmlplugindump/qmlplugindump.pro
index c713edc541..76f3fe2299 100644
--- a/tests/auto/qml/qmlplugindump/qmlplugindump.pro
+++ b/tests/auto/qml/qmlplugindump/qmlplugindump.pro
@@ -1,6 +1,8 @@
 CONFIG += testcase
 TARGET = tst_qmlplugindump
-QT += testlib gui-private
+QT += testlib gui-private qml
 macx:CONFIG -= app_bundle
 
+include(../../shared/util.pri)
+
 SOURCES += tst_qmlplugindump.cpp
diff --git a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
index 31009e0182..6915e789c6 100644
--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
@@ -26,6 +26,8 @@
 **
 ****************************************************************************/
 
+#include "util.h"
+
 #include <qtest.h>
 #include <QLibraryInfo>
 #include <QDir>
@@ -33,7 +35,7 @@
 #include <QDebug>
 #include <cstdlib>
 
-class tst_qmlplugindump : public QObject
+class tst_qmlplugindump : public QQmlDataTest
 {
     Q_OBJECT
 public:
@@ -54,6 +56,7 @@ tst_qmlplugindump::tst_qmlplugindump()
 
 void tst_qmlplugindump::initTestCase()
 {
+    QQmlDataTest::initTestCase();
     qmlplugindumpPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
 
 #if defined(Q_OS_WIN)
@@ -102,9 +105,8 @@ void tst_qmlplugindump::singleton()
 {
     QProcess dumper;
     QStringList args;
-    auto dir = QFileInfo(QFINDTESTDATA("tests")).dir().path();
-    args << QLatin1String("tests.dumper.CompositeSingleton") << QLatin1String("1.0")
-         << dir;
+    args << QLatin1String("dumper.CompositeSingleton") << QLatin1String("1.0")
+         << testFile(".");
     dumper.start(qmlplugindumpPath, args);
     QVERIFY2(dumper.waitForStarted(), qPrintable(dumper.errorString()));
     QVERIFY2(dumper.waitForFinished(), qPrintable(dumper.errorString()));
diff --git a/tests/auto/qml/qqmlcontext/data/Singleton.qml b/tests/auto/qml/qqmlcontext/data/Singleton.qml
new file mode 100644
index 0000000000..68ef5850e3
--- /dev/null
+++ b/tests/auto/qml/qqmlcontext/data/Singleton.qml
@@ -0,0 +1,5 @@
+pragma Singleton
+import QtQml 2.0
+QtObject {
+    readonly property string song: "Highway to Hell"
+}
diff --git a/tests/auto/qml/qqmlcontext/data/contextViaClosureAfterDestruction.qml b/tests/auto/qml/qqmlcontext/data/contextViaClosureAfterDestruction.qml
new file mode 100644
index 0000000000..2e0e6f20e2
--- /dev/null
+++ b/tests/auto/qml/qqmlcontext/data/contextViaClosureAfterDestruction.qml
@@ -0,0 +1,14 @@
+import QtQml 2.0
+
+import constants 1.0
+
+QtObject {
+    function createClosure() {
+        return function() { return Sing.song; }
+    }
+    function createComponentFactory() {
+        return function(parentObj) {
+            return Qt.createQmlObject('import QtQml 2.0; QtObject { property string test: "ok"; }', parentObj);
+        }
+    }
+}
diff --git a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
index f49fd391ac..5f57b9ebb0 100644
--- a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
+++ b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
@@ -62,6 +62,7 @@ private slots:
     void evalAfterInvalidate();
     void qobjectDerived();
     void qtbug_49232();
+    void contextViaClosureAfterDestruction();
 
 private:
     QQmlEngine engine;
@@ -723,6 +724,33 @@ void tst_qqmlcontext::qtbug_49232()
     QCOMPARE(obj->property("valueTwo"), QVariant(97));
 }
 
+void tst_qqmlcontext::contextViaClosureAfterDestruction()
+{
+    qmlRegisterSingletonType(testFileUrl("Singleton.qml"), "constants", 1, 0, "Sing");
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("contextViaClosureAfterDestruction.qml"));
+    QJSValue valueClosure;
+    QJSValue componentFactoryClosure;
+    {
+        QScopedPointer<QObject> obj(component.create());
+        QVERIFY(!obj.isNull());
+        // meta-calls don't support QJSValue return types, so do the call "by hand"
+        valueClosure = engine.newQObject(obj.data()).property(QStringLiteral("createClosure")).call();
+        QVERIFY(valueClosure.isCallable());
+        componentFactoryClosure = engine.newQObject(obj.data()).property(QStringLiteral("createComponentFactory")).call();
+        QVERIFY(componentFactoryClosure.isCallable());
+    }
+    QCOMPARE(valueClosure.call().toString(), QLatin1String("Highway to Hell"));
+
+    QScopedPointer<QObject> parent(new QObject);
+    QJSValue parentWrapper = engine.newQObject(parent.data());
+    QQmlEngine::setObjectOwnership(parent.data(), QQmlEngine::CppOwnership);
+
+    QJSValue subObject = componentFactoryClosure.callWithInstance(componentFactoryClosure, QJSValueList() << parentWrapper);
+    QVERIFY(subObject.isError());
+    QCOMPARE(subObject.toString(), QLatin1String("Error: Qt.createQmlObject(): Cannot create a component in an invalid context"));
+}
+
 QTEST_MAIN(tst_qqmlcontext)
 
 #include "tst_qqmlcontext.moc"
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.cpp b/tests/auto/qml/qqmlecmascript/testtypes.cpp
index c4692fdf31..80da5d7e52 100644
--- a/tests/auto/qml/qqmlecmascript/testtypes.cpp
+++ b/tests/auto/qml/qqmlecmascript/testtypes.cpp
@@ -245,9 +245,16 @@ public:
     MyWorkerObject *o;
 };
 
+MyWorkerObject::~MyWorkerObject()
+{
+    if (m_thread)
+        m_thread->wait();
+}
+
 void MyWorkerObject::doIt()
 {
-    new MyWorkerObjectThread(this);
+    Q_ASSERT(!m_thread);
+    m_thread = new MyWorkerObjectThread(this);
 }
 
 class MyDateClass : public QObject
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h
index eedeb66647..e15a05a00c 100644
--- a/tests/auto/qml/qqmlecmascript/testtypes.h
+++ b/tests/auto/qml/qqmlecmascript/testtypes.h
@@ -1532,12 +1532,17 @@ private:
 class MyWorkerObject : public QObject
 {
     Q_OBJECT
+public:
+    ~MyWorkerObject();
 
 public Q_SLOTS:
     void doIt();
 
 Q_SIGNALS:
     void done(const QString &result);
+
+private:
+    QThread *m_thread = 0;
 };
 
 class MyUnregisteredEnumTypeObject : public QObject
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 7583579de6..899f14b51d 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -7447,21 +7447,17 @@ void tst_qqmlecmascript::signalEmitted()
 void tst_qqmlecmascript::threadSignal()
 {
     {
-    QQmlComponent c(&engine, testFileUrl("threadSignal.qml"));
-    QObject *object = c.create();
-    QVERIFY(object != 0);
-    QTRY_VERIFY(object->property("passed").toBool());
-    delete object;
+        QQmlComponent c(&engine, testFileUrl("threadSignal.qml"));
+        QScopedPointer<QObject> object(c.create());
+        QVERIFY(!object.isNull());
+        QTRY_VERIFY(object->property("passed").toBool());
     }
     {
-    QQmlComponent c(&engine, testFileUrl("threadSignal.2.qml"));
-    QObject *object = c.create();
-    QVERIFY(object != 0);
-    QSignalSpy doneSpy(object, SIGNAL(done(QString)));
-    QMetaObject::invokeMethod(object, "doIt");
-    QTRY_VERIFY(object->property("passed").toBool());
-    QCOMPARE(doneSpy.count(), 1);
-    delete object;
+        QQmlComponent c(&engine, testFileUrl("threadSignal.2.qml"));
+        QScopedPointer<QObject> object(c.create());
+        QVERIFY(!object.isNull());
+        QMetaObject::invokeMethod(object.data(), "doIt");
+        QTRY_VERIFY(object->property("passed").toBool());
     }
 }
 
diff --git a/tests/auto/qml/qqmlengine/qqmlengine.pro b/tests/auto/qml/qqmlengine/qqmlengine.pro
index e7952d8e3a..8d1e149d62 100644
--- a/tests/auto/qml/qqmlengine/qqmlengine.pro
+++ b/tests/auto/qml/qqmlengine/qqmlengine.pro
@@ -7,3 +7,8 @@ include (../../shared/util.pri)
 SOURCES += tst_qqmlengine.cpp
 
 QT += core-private gui-private qml-private  network testlib
+
+boot2qt: {
+    # GC corruption test is too heavy for qemu-arm
+    DEFINES += SKIP_GCCORRUPTION_TEST
+}
diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
index 7aca830297..b332ab2194 100644
--- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
+++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
@@ -862,6 +862,10 @@ void tst_qqmlengine::qmlContextProperties()
 
 void tst_qqmlengine::testGCCorruption()
 {
+#ifdef SKIP_GCCORRUPTION_TEST
+    QSKIP("Test too heavy for qemu");
+#endif
+
     QQmlEngine e;
 
     QQmlComponent c(&e, testFileUrl("testGCCorruption.qml"));
diff --git a/tests/auto/qml/qqmlenginecleanup/qqmlenginecleanup.pro b/tests/auto/qml/qqmlenginecleanup/qqmlenginecleanup.pro
index 5bcec9f5b4..90508609a8 100644
--- a/tests/auto/qml/qqmlenginecleanup/qqmlenginecleanup.pro
+++ b/tests/auto/qml/qqmlenginecleanup/qqmlenginecleanup.pro
@@ -6,4 +6,4 @@ include (../../shared/util.pri)
 
 SOURCES += tst_qqmlenginecleanup.cpp
 
-QT += testlib qml
+QT += testlib qml qml-private
diff --git a/tests/auto/qml/qqmlenginecleanup/tst_qqmlenginecleanup.cpp b/tests/auto/qml/qqmlenginecleanup/tst_qqmlenginecleanup.cpp
index d0a8b6401f..7e9a1524b0 100644
--- a/tests/auto/qml/qqmlenginecleanup/tst_qqmlenginecleanup.cpp
+++ b/tests/auto/qml/qqmlenginecleanup/tst_qqmlenginecleanup.cpp
@@ -31,6 +31,8 @@
 #include <QtQml/qqml.h>
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlComponent>
+#include <private/qhashedstring_p.h>
+#include <private/qqmlmetatype_p.h>
 
 //Separate test, because if engine cleanup attempts fail they can easily break unrelated tests
 class tst_qqmlenginecleanup : public QQmlDataTest
@@ -44,41 +46,82 @@ private slots:
     void test_valueTypeProviderModule(); // QTBUG-43004
 };
 
+// A wrapper around QQmlComponent to ensure the temporary reference counts
+// on the type data as a result of the main thread <> loader thread communication
+// are dropped. 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. A plain sendPostedEvents() however is insufficient because
+// we can't be sure that the event is posted after the constructor finished.
+class CleanlyLoadingComponent : public QQmlComponent
+{
+public:
+    CleanlyLoadingComponent(QQmlEngine *engine, const QUrl &url)
+        : QQmlComponent(engine, url, QQmlComponent::Asynchronous)
+    { waitForLoad(); }
+    CleanlyLoadingComponent(QQmlEngine *engine, const QString &fileName)
+        : QQmlComponent(engine, fileName, QQmlComponent::Asynchronous)
+    { waitForLoad(); }
+
+    void waitForLoad()
+    {
+        QTRY_VERIFY(status() == QQmlComponent::Ready || status() == QQmlComponent::Error);
+    }
+};
+
 void tst_qqmlenginecleanup::test_qmlClearTypeRegistrations()
 {
     //Test for preventing memory leaks is in tests/manual/qmltypememory
     QQmlEngine* engine;
-    QQmlComponent* component;
+    CleanlyLoadingComponent* component;
     QUrl testFile = testFileUrl("types.qml");
 
+    const auto qmlTypeForTestType = []() {
+        return QQmlMetaType::qmlType(QStringLiteral("TestTypeCpp"), QStringLiteral("Test"), 2, 0);
+    };
+
+    QVERIFY(!qmlTypeForTestType().isValid());
     qmlRegisterType<QObject>("Test", 2, 0, "TestTypeCpp");
+    QVERIFY(qmlTypeForTestType().isValid());
+
     engine = new QQmlEngine;
-    component = new QQmlComponent(engine, testFile);
+    component = new CleanlyLoadingComponent(engine, testFile);
     QVERIFY(component->isReady());
 
-    delete engine;
     delete component;
-    qmlClearTypeRegistrations();
+    delete engine;
+
+    {
+        auto cppType = qmlTypeForTestType();
+
+        qmlClearTypeRegistrations();
+        QVERIFY(!qmlTypeForTestType().isValid());
+
+        // cppType should hold the last ref, qmlClearTypeRegistration should have wiped
+        // all internal references.
+        QCOMPARE(QQmlType::refCount(cppType.priv()), 1);
+    }
 
     //2nd run verifies that types can reload after a qmlClearTypeRegistrations
     qmlRegisterType<QObject>("Test", 2, 0, "TestTypeCpp");
+    QVERIFY(qmlTypeForTestType().isValid());
     engine = new QQmlEngine;
-    component = new QQmlComponent(engine, testFile);
+    component = new CleanlyLoadingComponent(engine, testFile);
     QVERIFY(component->isReady());
 
-    delete engine;
     delete component;
+    delete engine;
     qmlClearTypeRegistrations();
+    QVERIFY(!qmlTypeForTestType().isValid());
 
     //3nd run verifies that TestTypeCpp is no longer registered
     engine = new QQmlEngine;
-    component = new QQmlComponent(engine, testFile);
+    component = new CleanlyLoadingComponent(engine, testFile);
     QVERIFY(component->isError());
     QCOMPARE(component->errorString(),
             testFile.toString() +":33 module \"Test\" is not installed\n");
 
-    delete engine;
     delete component;
+    delete engine;
 }
 
 static void cleanState(QQmlEngine **e)
diff --git a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
index 68739886c4..70aaa9678e 100644
--- a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
+++ b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
@@ -54,7 +54,7 @@ void tst_QQmlImport::cleanup()
 void tst_QQmlImport::testDesignerSupported()
 {
     QQuickView *window = new QQuickView();
-    window->engine()->addImportPath(QT_TESTCASE_BUILDDIR);
+    window->engine()->addImportPath(directory());
 
     window->setSource(testFileUrl("testfile_supported.qml"));
     QVERIFY(window->errors().isEmpty());
@@ -68,7 +68,7 @@ void tst_QQmlImport::testDesignerSupported()
     delete window;
     window = new QQuickView();
 
-    window->engine()->addImportPath(QT_TESTCASE_BUILDDIR);
+    window->engine()->addImportPath(directory());
     window->engine()->clearComponentCache();
 
     window->setSource(testFileUrl("testfile_supported.qml"));
@@ -91,7 +91,7 @@ void tst_QQmlImport::uiFormatLoading()
     int size = 0;
 
     QQmlApplicationEngine *test = new QQmlApplicationEngine(testFileUrl("TestForm.ui.qml"));
-    test->addImportPath(QT_TESTCASE_BUILDDIR);
+    test->addImportPath(directory());
     QCOMPARE(test->rootObjects().size(), ++size);
     QVERIFY(test->rootObjects()[size -1]);
     QVERIFY(test->rootObjects()[size -1]->property("success").toBool());
diff --git a/tests/auto/qml/qqmlinstantiator/stringmodel.h b/tests/auto/qml/qqmlinstantiator/stringmodel.h
index 0bd4ada55e..b01817375a 100644
--- a/tests/auto/qml/qqmlinstantiator/stringmodel.h
+++ b/tests/auto/qml/qqmlinstantiator/stringmodel.h
@@ -65,7 +65,7 @@ public:
         return items.count();
     }
 
-    virtual QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE
+    QHash<int, QByteArray> roleNames() const override
     {
         return roles;
     }
@@ -75,7 +75,7 @@ public:
         return 1;
     }
 
-    virtual bool hasChildren(const QModelIndex &) const Q_DECL_OVERRIDE
+    bool hasChildren(const QModelIndex &) const override
     {
         return rowCount(QModelIndex()) > 0;
     }
diff --git a/tests/auto/qml/qqmllanguage/data/MyLazyDeferredSubObject.qml b/tests/auto/qml/qqmllanguage/data/MyLazyDeferredSubObject.qml
new file mode 100644
index 0000000000..f311f6b602
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/MyLazyDeferredSubObject.qml
@@ -0,0 +1,6 @@
+import QtQml 2.0
+import Test 1.0
+LazyDeferredSubObject {
+    subObject: QtObject { objectName: 'default' }
+    objectName: subObject.objectName
+}
diff --git a/tests/auto/qml/qqmllanguage/data/lazyDeferredSubObject.qml b/tests/auto/qml/qqmllanguage/data/lazyDeferredSubObject.qml
new file mode 100644
index 0000000000..2465a18320
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/lazyDeferredSubObject.qml
@@ -0,0 +1,5 @@
+import QtQml 2.0
+import Test 1.0
+MyLazyDeferredSubObject {
+    subObject.objectName: 'custom'
+}
diff --git a/tests/auto/qml/qqmllanguage/testtypes.cpp b/tests/auto/qml/qqmllanguage/testtypes.cpp
index bdcdaa8137..72e06d26aa 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.cpp
+++ b/tests/auto/qml/qqmllanguage/testtypes.cpp
@@ -103,6 +103,8 @@ void registerTypes()
     qmlRegisterSingletonType<MyTypeObjectSingleton>("Test", 1, 0, "MyTypeObjectSingleton", myTypeObjectSingleton);
 
     qmlRegisterType<MyArrayBufferTestClass>("Test", 1, 0, "MyArrayBufferTestClass");
+
+    qmlRegisterType<LazyDeferredSubObject>("Test", 1, 0, "LazyDeferredSubObject");
 }
 
 QVariant myCustomVariantTypeConverter(const QString &data)
diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h
index e4a76b4324..09c6992a51 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.h
+++ b/tests/auto/qml/qqmllanguage/testtypes.h
@@ -1349,6 +1349,26 @@ private:
     QObject *obj;
 };
 
+class LazyDeferredSubObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QObject *subObject READ subObject WRITE setSubObject NOTIFY subObjectChanged FINAL)
+    Q_CLASSINFO("DeferredPropertyNames", "subObject");
+public:
+    LazyDeferredSubObject()
+        : obj(0)
+    {}
+
+    QObject *subObject() const { if (!obj) qmlExecuteDeferred(const_cast<LazyDeferredSubObject *>(this)); return obj; }
+    void setSubObject(QObject *o) { if (obj == o) return; obj = o; emit subObjectChanged(); }
+
+signals:
+    void subObjectChanged();
+
+private:
+    QObject *obj;
+};
+
 void registerTypes();
 
 #endif // TESTTYPES_H
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index f09c130e38..e5366b5c48 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -250,6 +250,7 @@ private slots:
     void propertyCacheInSync();
 
     void rootObjectInCreationNotForSubObjects();
+    void lazyDeferredSubObject();
 
     void noChildEvents();
 
@@ -2152,7 +2153,7 @@ void tst_qqmllanguage::scriptStringWithoutSourceCode()
         qmlUnit->flags &= ~QV4::CompiledData::Unit::StaticData;
         td->compilationUnit()->data = qmlUnit;
 
-        const QV4::CompiledData::Object *rootObject = qmlUnit->objectAt(qmlUnit->indexOfRootObject);
+        const QV4::CompiledData::Object *rootObject = qmlUnit->objectAt(/*root object*/0);
         QCOMPARE(qmlUnit->stringAt(rootObject->inheritedTypeNameIndex), QString("MyTypeObject"));
         quint32 i;
         for (i = 0; i < rootObject->nBindings; ++i) {
@@ -4314,6 +4315,21 @@ void tst_qqmllanguage::rootObjectInCreationNotForSubObjects()
     QVERIFY(!ddata->rootObjectInCreation);
 }
 
+// QTBUG-63036
+void tst_qqmllanguage::lazyDeferredSubObject()
+{
+    QQmlComponent component(&engine, testFile("lazyDeferredSubObject.qml"));
+    VERIFY_ERRORS(0);
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY(!object.isNull());
+
+    QObject *subObject = qvariant_cast<QObject *>(object->property("subObject"));
+    QVERIFY(subObject);
+
+    QCOMPARE(object->objectName(), QStringLiteral("custom"));
+    QCOMPARE(subObject->objectName(), QStringLiteral("custom"));
+}
+
 void tst_qqmllanguage::noChildEvents()
 {
     QQmlComponent component(&engine);
diff --git a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
index e442dd1421..4089673d68 100644
--- a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
+++ b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
@@ -123,6 +123,7 @@ private slots:
     void about_to_be_signals();
     void modify_through_delegate();
     void bindingsOnGetResult();
+    void stringifyModelEntry();
 };
 
 bool tst_qqmllistmodel::compareVariantList(const QVariantList &testList, QVariant object)
@@ -1482,6 +1483,28 @@ void tst_qqmllistmodel::bindingsOnGetResult()
     QVERIFY(obj->property("success").toBool());
 }
 
+void tst_qqmllistmodel::stringifyModelEntry()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData(
+                      "import QtQuick 2.0\n"
+                      "Item {\n"
+                      "   ListModel {\n"
+                      "       id: testModel\n"
+                      "       objectName: \"testModel\"\n"
+                      "       ListElement { name: \"Joe\"; age: 22 }\n"
+                      "   }\n"
+                      "}\n", QUrl());
+    QScopedPointer<QObject> scene(component.create());
+    QQmlListModel *model = scene->findChild<QQmlListModel*>("testModel");
+    QQmlExpression expr(engine.rootContext(), model, "JSON.stringify(get(0));");
+    QVariant v = expr.evaluate();
+    QVERIFY2(!expr.hasError(), QTest::toString(expr.error().toString()));
+    const QString expectedString = QStringLiteral("{\"age\":22,\"name\":\"Joe\"}");
+    QCOMPARE(v.toString(), expectedString);
+}
+
 QTEST_MAIN(tst_qqmllistmodel)
 
 #include "tst_qqmllistmodel.moc"
diff --git a/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp b/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
index beb60925bb..88a5d41975 100644
--- a/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
+++ b/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
@@ -98,7 +98,7 @@ public:
     }
 
 protected:
-    void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE {
+    void connectNotify(const QMetaMethod &signal) override {
         if (signal.name() == "qmlObjectPropChanged") qmlObjectPropConnections++;
         if (signal.name() == "cppObjectPropChanged") cppObjectPropConnections++;
         if (signal.name() == "unboundPropChanged") unboundPropConnections++;
@@ -112,7 +112,7 @@ protected:
         //qDebug() << Q_FUNC_INFO << this << signal.name();
     }
 
-    void disconnectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE {
+    void disconnectNotify(const QMetaMethod &signal) override {
         if (signal.name() == "qmlObjectPropChanged") qmlObjectPropConnections--;
         if (signal.name() == "cppObjectPropChanged") cppObjectPropConnections--;
         if (signal.name() == "unboundPropChanged") unboundPropConnections--;
@@ -146,7 +146,7 @@ public:
     {}
 
 private slots:
-    void initTestCase() Q_DECL_OVERRIDE;
+    void initTestCase() override;
     void cleanupTestCase();
     void testConnectNotify();
 
diff --git a/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp b/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp
index 1c9523fc38..80c54bdf8e 100644
--- a/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp
+++ b/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp
@@ -86,7 +86,7 @@ void tst_qqmltranslation::translation()
                              << QStringLiteral("singular") << QStringLiteral("plural");
 
         const QV4::CompiledData::Unit *unit = compilationUnit->data;
-        const QV4::CompiledData::Object *rootObject = unit->objectAt(unit->indexOfRootObject);
+        const QV4::CompiledData::Object *rootObject = unit->objectAt(/*root object*/0);
         const QV4::CompiledData::Binding *binding = rootObject->bindingTable();
         for (quint32 i = 0; i < rootObject->nBindings; ++i, ++binding) {
             const QString propertyName = unit->stringAt(binding->propertyNameIndex);
@@ -141,7 +141,7 @@ void tst_qqmltranslation::idTranslation()
         QVERIFY(compilationUnit);
 
         const QV4::CompiledData::Unit *unit = compilationUnit->data;
-        const QV4::CompiledData::Object *rootObject = unit->objectAt(unit->indexOfRootObject);
+        const QV4::CompiledData::Object *rootObject = unit->objectAt(/*root object*/0);
         const QV4::CompiledData::Binding *binding = rootObject->bindingTable();
         for (quint32 i = 0; i < rootObject->nBindings; ++i, ++binding) {
             const QString propertyName = unit->stringAt(binding->propertyNameIndex);
diff --git a/tests/auto/qml/qwidgetsinqml/qwidgetsinqml.pro b/tests/auto/qml/qwidgetsinqml/qwidgetsinqml.pro
new file mode 100644
index 0000000000..c86365d5ea
--- /dev/null
+++ b/tests/auto/qml/qwidgetsinqml/qwidgetsinqml.pro
@@ -0,0 +1,7 @@
+CONFIG += testcase
+CONFIG += parallel_test
+TARGET = tst_qwidgetsinqml
+macos:CONFIG -= app_bundle
+QT += qml widgets testlib gui-private
+SOURCES  += tst_qwidgetsinqml.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qwidgetsinqml/tst_qwidgetsinqml.cpp b/tests/auto/qml/qwidgetsinqml/tst_qwidgetsinqml.cpp
new file mode 100644
index 0000000000..bbe717859b
--- /dev/null
+++ b/tests/auto/qml/qwidgetsinqml/tst_qwidgetsinqml.cpp
@@ -0,0 +1,288 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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.
+**
+** 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.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QQmlEngine>
+#include <QtQml>
+#include <QWidget>
+
+class tst_QWidgetsInQml : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QWidgetsInQml();
+
+private slots:
+    void instantiateWidget();
+    void instantiateWidgetWithoutParentWidget();
+    void widgetAsDefaultPropertyCollected();
+    void widgetAsDefaultPropertyKept();
+    void widgetAsDefaultPropertyKeptDuringCreation();
+};
+
+static void gc(QQmlEngine &engine)
+{
+    engine.collectGarbage();
+    QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+    QCoreApplication::processEvents();
+}
+
+// Like QtObject, but with default property
+class QObjectContainer : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("DefaultProperty", "data");
+    Q_PROPERTY(QQmlListProperty<QObject> data READ data DESIGNABLE false);
+public:
+    QObjectContainer()
+        : widgetParent(0)
+        , gcOnAppend(false)
+    {}
+
+    QQmlListProperty<QObject> data() {
+        return QQmlListProperty<QObject>(this, 0, children_append, children_count, children_at, children_clear);
+    }
+
+    static void children_append(QQmlListProperty<QObject> *prop, QObject *o)
+    {
+        QObjectContainer *that = static_cast<QObjectContainer*>(prop->object);
+        that->dataChildren.append(o);
+        QObject::connect(o, SIGNAL(destroyed(QObject*)), prop->object, SLOT(childDestroyed(QObject*)));
+        QWidget *widget = qobject_cast<QWidget*>(o);
+        if (widget && that->widgetParent)
+            widget->setParent(that->widgetParent);
+
+        if (that->gcOnAppend) {
+            QQmlEngine *engine = qmlEngine(that);
+            gc(*engine);
+        }
+    }
+
+    static int children_count(QQmlListProperty<QObject> *prop)
+    {
+        return static_cast<QObjectContainer*>(prop->object)->dataChildren.count();
+    }
+
+    static QObject *children_at(QQmlListProperty<QObject> *prop, int index)
+    {
+        return static_cast<QObjectContainer*>(prop->object)->dataChildren.at(index);
+    }
+
+    static void children_clear(QQmlListProperty<QObject> *prop)
+    {
+        QObjectContainer *that = static_cast<QObjectContainer*>(prop->object);
+        foreach (QObject *c, that->dataChildren)
+            QObject::disconnect(c, SIGNAL(destroyed(QObject*)), that, SLOT(childDestroyed(QObject*)));
+        that->dataChildren.clear();
+    }
+
+    QList<QObject*> dataChildren;
+    QWidget *widgetParent;
+    bool gcOnAppend;
+
+protected slots:
+    void childDestroyed(QObject *child) {
+        dataChildren.removeAll(child);
+    }
+};
+
+class QWidgetContainer : public QObjectContainer
+{
+    Q_OBJECT
+public:
+    QWidgetContainer()
+    {
+        widgetParent = new QWidget;
+        QQmlEngine::setObjectOwnership(widgetParent, QQmlEngine::CppOwnership);
+    }
+    virtual ~QWidgetContainer()
+    {
+        delete widgetParent;
+        widgetParent = 0;
+    }
+};
+
+class QObjectContainerWithGCOnAppend : public QObjectContainer
+{
+    Q_OBJECT
+public:
+    QObjectContainerWithGCOnAppend()
+    {
+        gcOnAppend = true;
+    }
+};
+
+tst_QWidgetsInQml::tst_QWidgetsInQml()
+{
+    qmlRegisterType<QWidget>("Qt.Widgets", 1, 0, "QWidget");
+    qmlRegisterType<QObjectContainer>("Qt.Widgets", 1, 0, "QObjectContainer");
+    qmlRegisterType<QWidgetContainer>("Qt.Widgets", 1, 0, "QWidgetContainer");
+    qmlRegisterType<QObjectContainerWithGCOnAppend>("Qt.Widgets", 1, 0, "QObjectContainerWithGCOnAppend");
+}
+
+void tst_QWidgetsInQml::instantiateWidget()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData("import Qt.Widgets 1.0;\nQWidget { property QWidget child: QWidget { objectName: 'child' } }", QUrl());
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY(!object.isNull());
+    QWidget *rootWidget = qobject_cast<QWidget*>(object.data());
+    QVERIFY(rootWidget != 0);
+    QCOMPARE(rootWidget->children().count(), 1);
+    QWidget *firstChildWidget = qobject_cast<QWidget*>(rootWidget->children().first());
+    QVERIFY(firstChildWidget != 0);
+
+    QWidget *widgetProperty = qvariant_cast<QWidget*>(object->property("child"));
+    QVERIFY(widgetProperty != 0);
+    QCOMPARE(firstChildWidget, widgetProperty);
+    QCOMPARE(firstChildWidget->objectName(), QString("child"));
+}
+
+void tst_QWidgetsInQml::instantiateWidgetWithoutParentWidget()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData("import Qt.Widgets 1.0;\n"
+                      "import QtQml 2.0;\n"
+                      "QtObject { property QtObject child: QWidget { objectName: 'child' } }", QUrl());
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY(!object.isNull());
+
+    QPointer<QWidget> widgetProperty = qvariant_cast<QWidget*>(object->property("child"));
+    QVERIFY(!widgetProperty.isNull());
+    QCOMPARE(widgetProperty->objectName(), QString("child"));
+
+    QVERIFY(!widgetProperty->parent());
+    gc(engine);
+    // Don't collect, the property reference should keep it alive
+    QVERIFY(!widgetProperty.isNull());
+}
+
+void tst_QWidgetsInQml::widgetAsDefaultPropertyCollected()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData("import Qt.Widgets 1.0;\n"
+                      "import QtQml 2.0;\n"
+                      "QObjectContainer {\n"
+                      "    QWidget {\n"
+                      "        id: parentLessChild;\n"
+                      "        objectName: 'child'\n"
+                      "    }\n"
+                      "    property var widgetHolder;\n"
+                      "    Component.onCompleted: {\n"
+                      "        widgetHolder = parentLessChild;\n"
+                      "    }\n"
+                      "}", QUrl());
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY(!object.isNull());
+
+    QObjectContainer *container = qobject_cast<QObjectContainer*>(object.data());
+    QCOMPARE(container->dataChildren.count(), 1);
+
+    QJSValue holder = qvariant_cast<QJSValue>(object->property("widgetHolder"));
+    QVERIFY(!holder.isNull());
+    gc(engine);
+    QCOMPARE(container->dataChildren.count(), 1);
+
+    holder = QJSValue();
+    object->setProperty("widgetHolder", QVariant::fromValue(holder));
+
+    gc(engine);
+    // The QWidget is without a parent and nobody is referencing it anymore (the children
+    // list in QObjectContainer is weak!), so it should get collected.
+    QCOMPARE(container->dataChildren.count(), 0);
+}
+
+void tst_QWidgetsInQml::widgetAsDefaultPropertyKept()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData("import Qt.Widgets 1.0;\n"
+                      "import QtQml 2.0;\n"
+                      "QWidgetContainer {\n"
+                      "    QWidget {\n"
+                      "        id: parentLessChild;\n"
+                      "        objectName: 'child'\n"
+                      "    }\n"
+                      "    property var widgetHolder;\n"
+                      "    Component.onCompleted: {\n"
+                      "        widgetHolder = parentLessChild;\n"
+                      "    }\n"
+                      "}", QUrl());
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY(!object.isNull());
+
+    QWidgetContainer *container = qobject_cast<QWidgetContainer*>(object.data());
+    QCOMPARE(container->dataChildren.count(), 1);
+
+    QJSValue holder = qvariant_cast<QJSValue>(object->property("widgetHolder"));
+    QVERIFY(!holder.isNull());
+    gc(engine);
+    QCOMPARE(container->dataChildren.count(), 1);
+
+    holder = QJSValue();
+    object->setProperty("widgetHolder", QVariant::fromValue(holder));
+
+    gc(engine);
+    QCOMPARE(container->dataChildren.count(), 1);
+}
+
+void tst_QWidgetsInQml::widgetAsDefaultPropertyKeptDuringCreation()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData("import Qt.Widgets 1.0;\n"
+                      "import QtQml 2.0;\n"
+                      "QObjectContainerWithGCOnAppend {\n"
+                      "    QWidget {\n"
+                      "        id: parentLessChild;\n"
+                      "        objectName: 'child'\n"
+                      "        property var blah;\n" // Ensures that we have a JS wrapper
+                      "    }\n"
+                      "}", QUrl());
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY(!object.isNull());
+
+    QObjectContainer *container = qobject_cast<QObjectContainer*>(object.data());
+    QCOMPARE(container->dataChildren.count(), 1);
+
+    gc(engine);
+    QCOMPARE(container->dataChildren.count(), 0);
+
+}
+
+QTEST_MAIN(tst_QWidgetsInQml)
+
+#include "tst_qwidgetsinqml.moc"