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, 25 insertions, 6 deletions

diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index 9332bbc..6c1b6e7 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -578,11 +578,10 @@ QUuid QUuid::createUuid()
 QT_BEGIN_INCLUDE_NAMESPACE
 #include "qdatetime.h"
 #include "qfile.h"
-#include "stdlib.h" // For srand/rand
+#include "qthreadstorage.h"
+#include <stdlib.h> // for RAND_MAX
 QT_END_INCLUDE_NAMESPACE
 
-extern void qsrand(); // in qglobal.cpp
-
 QUuid QUuid::createUuid()
 {
     QUuid result;
@@ -600,12 +599,32 @@ QUuid QUuid::createUuid()
         static const int intbits = sizeof(int)*8;
         static int randbits = 0;
         if (!randbits) {
+        int r = 0;
             int max = RAND_MAX;
-            do { ++randbits; } while ((max=max>>1));
+            do { ++r; } while ((max=max>>1));
+            randbits = r;
         }
 
-        // reseed, but only if not already seeded
-        qsrand();
+    // Seed the PRNG once per thread with a combination of current time, a
+    // stack address and a serial counter (since thread stack addresses are
+    // re-used).
+#ifndef QT_BOOTSTRAPPED
+    static QThreadStorage<int *> uuidseed;
+    if (!uuidseed.hasLocalData())
+    {
+        int *pseed = new int;
+        static QBasicAtomicInt serial = Q_BASIC_ATOMIC_INITIALIZER(2);
+        qsrand(*pseed = QDateTime::currentDateTime().toTime_t()
+                        + quintptr(&pseed)
+                        + serial.fetchAndAddRelaxed(1));
+        uuidseed.setLocalData(pseed);
+    }
+#else
+    static bool seeded = false;
+    if (!seeded)
+        qsrand(QDateTime::currentDateTime().toTime_t()
+               + quintptr(&seeded));
+#endif
 
         int chunks = 16 / sizeof(uint);
         while (chunks--) {