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

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Fix BlendBench::unalignedBlendArgb32 test case
  Fix memory leak in XSD component of XmlPatterns
  Added autotest for threaded text rendering.
  Implement support for enable_backup CONFIG value.
  Make text rendering working outside the gui thread on Symbian.
  Fix autotest failure in XmlPattern qxmlquery
  Fix memory leak bugs in XmlPatterns
  Symbian's QElapsedTimer::restart() fixed to return ms rather than us
  Create a cleanup stack for each new thread on Symbian.
  Do not modify window size for fullscreen windows in setGeometry_sys
  Fixed Qt UDA creation for Symbian
  Enablers for the Qt eclipsing in Symbian
  Improve logic to find default certificates in createpackage script
  Fix "make sis" for projects that have empty OBJECTS_DIR
  Add focus frame support in style sheet
  Fix OpenGL build break on Symbian

2 files changed, 5 insertions, 1 deletions

diff --git a/src/corelib/thread/qthread_symbian.cpp b/src/corelib/thread/qthread_symbian.cpp
index 5d8b5cb..665aadd 100644
--- a/src/corelib/thread/qthread_symbian.cpp
+++ b/src/corelib/thread/qthread_symbian.cpp
@@ -329,6 +329,8 @@ void *QThreadPrivate::start(void *arg)
         data->quitNow = thr->d_func()->exited;
     }
 
+    CTrapCleanup *cleanup = CTrapCleanup::New();
+
     // ### TODO: allow the user to create a custom event dispatcher
     createEventDispatcher(data);
 
@@ -337,6 +339,8 @@ void *QThreadPrivate::start(void *arg)
 
     QThreadPrivate::finish(arg);
 
+    delete cleanup;
+
     return 0;
 }
 
diff --git a/src/corelib/tools/qelapsedtimer_symbian.cpp b/src/corelib/tools/qelapsedtimer_symbian.cpp
index b831e03..3667b05 100644
--- a/src/corelib/tools/qelapsedtimer_symbian.cpp
+++ b/src/corelib/tools/qelapsedtimer_symbian.cpp
@@ -95,7 +95,7 @@ qint64 QElapsedTimer::restart()
     qint64 oldt1 = t1;
     t1 = getMicrosecondFromTick();
     t2 = 0;
-    return t1 - oldt1;
+    return (t1 - oldt1) / 1000;
 }
 
 qint64 QElapsedTimer::nsecsElapsed() const