Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	src/gui/kernel/qapplication.cpp
	tests/auto/qfileinfo/tst_qfileinfo.cpp
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf
	tools/qdoc3/test/qmake.qdocconf
	tools/qdoc3/test/qt-build-docs.qdocconf
	tools/qdoc3/test/qt.qdocconf

1 files changed, 29 insertions, 0 deletions

diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 6ebe0aad28..81fb7496af 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -4297,6 +4297,35 @@ void tst_QScriptEngine::reentrancy()
         QScriptEngine eng;
         QCOMPARE(eng.evaluate("Array()").toString(), QString());
     }
+
+    {
+        QScriptEngine eng1;
+        QScriptEngine eng2;
+        {
+            QScriptValue d1 = eng1.newDate(0);
+            QScriptValue d2 = eng2.newDate(0);
+            QCOMPARE(d1.toDateTime(), d2.toDateTime());
+            QCOMPARE(d2.toDateTime(), d1.toDateTime());
+        }
+        {
+            QScriptValue r1 = eng1.newRegExp("foo", "gim");
+            QScriptValue r2 = eng2.newRegExp("foo", "gim");
+            QCOMPARE(r1.toRegExp(), r2.toRegExp());
+            QCOMPARE(r2.toRegExp(), r1.toRegExp());
+        }
+        {
+            QScriptValue o1 = eng1.newQObject(this);
+            QScriptValue o2 = eng2.newQObject(this);
+            QCOMPARE(o1.toQObject(), o2.toQObject());
+            QCOMPARE(o2.toQObject(), o1.toQObject());
+        }
+        {
+            QScriptValue mo1 = eng1.newQMetaObject(&staticMetaObject);
+            QScriptValue mo2 = eng2.newQMetaObject(&staticMetaObject);
+            QCOMPARE(mo1.toQMetaObject(), mo2.toQMetaObject());
+            QCOMPARE(mo2.toQMetaObject(), mo1.toQMetaObject());
+        }
+    }
 }
 
 void tst_QScriptEngine:: incDecNonObjectProperty()