Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Fix race condition in processJobs()
  Don't endless loop
  Compile on symbian
  Don't release register prematurely
  Rework threading internals in XmlListModel to avoid global static
  Doc
  Doc
  Compile in namespace
  Fix alias warnings in QML compiled bindings
  Fix alias warnings in MetaCallArgument
  Fix alias warnings in QDeclarativeVME
  Fix alias warnings in QDeclarativeGuard

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 71214a3..bf7c9a4 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -177,6 +177,7 @@ private slots:
     void aliasWritesOverrideBindings();
     void pushCleanContext();
     void realToInt();
+    void qtbug_20648();
 
     void include();
 
@@ -3090,6 +3091,15 @@ void tst_qdeclarativeecmascript::realToInt()
     QCOMPARE(object->value(), int(8));
 }
 
+void tst_qdeclarativeecmascript::qtbug_20648()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("qtbug_20648.qml"));
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+    QCOMPARE(o->property("test").toInt(), 100);
+    delete o;
+}
+
 QTEST_MAIN(tst_qdeclarativeecmascript)
 
 #include "tst_qdeclarativeecmascript.moc"