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

1 files changed, 9 insertions, 13 deletions

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());
     }
 }