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 Symbian system date format parsing.
  Fix QXmlSimpleReader auto test failer
  Fix pointer event mapping when windows are fixed to native orientation
  Fix incorrect Symbian version check.
  Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds.
  Improved support for shadow builds in Symbian.
  Fix def file paths for Symbian shadow builds
  Giving QUuid::createUuid() more entropy on Symbian
  Enable running of XQuery test suite
  QXmlSimpleReader handle external entity reference file over 1k

1 files changed, 6 insertions, 0 deletions

diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index af63b79..83c6194 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -901,6 +901,12 @@ QUuid QUuid::createUuid()
             uint randNumber = 0;
             for (int filled = 0; filled < intbits; filled += randbits)
                 randNumber |= qrand()<<filled;
+#if defined(Q_OS_SYMBIAN)
+            // Symbian does not have /dev/urandom, so entropy is low.
+            // Add more entropy from the kernel tick count (1ms resolution).
+            // big multipler used to splatter the tick count bits over the whole 32 bits
+            randNumber ^= User::NTickCount() * 0x3b9aca07;
+#endif
             *(data+chunks) = randNumber;
         }
     }