Merge branch '4.5'

Conflicts:
	tools/linguist/lupdate/qscript.cpp
	tools/linguist/lupdate/qscript.g
	tools/linguist/lupdate/ui.cpp
	tools/linguist/shared/cpp.cpp
	tools/linguist/shared/qph.cpp
	tools/linguist/shared/translator.h

4 files changed, 26 insertions, 19 deletions

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 05015c0..0e632db 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2179,13 +2179,29 @@ void QObject::deleteLater()
   Signals and slots
  *****************************************************************************/
 
+// list taken from http://en.wikipedia.org/wiki/Thread-Specific_Storage
+#if defined(Q_OS_WIN)
+// Some people like to dynamically load Qt (LoadLibrary), so we can't use this
+#elif defined(Q_CC_GNU) && !defined(Q_WS_QWS)
+// GCC has warnings about this not being ported to all archs
+// So we only enable what we know to work. More archs can be added later, like Mac
+# if defined(Q_OS_LINUX) && (defined(QT_ARCH_I386) || defined(QT_ARCH_X86_64) || defined(QT_ARCH_IA64))
+#  define THRSPECIFIC   __thread __attribute__((tls_model("local-dynamic")))
+# endif
+#elif defined(Q_CC_SUN) || defined(Q_CC_INTEL) || defined(Q_CC_XLC)
+#  define THRSPECIFIC   __thread
+#endif
+
+#ifndef THRSPECIFIC
+# define THRSPECIFIC
+#endif
 
 const int flagged_locations_count = 2;
-static const char* flagged_locations[flagged_locations_count] = {0};
+static THRSPECIFIC const char* flagged_locations[flagged_locations_count] = {0};
 
 const char *qFlagLocation(const char *method)
 {
-    static int idx = 0;
+    static THRSPECIFIC int idx = 0;
     flagged_locations[idx] = method;
     idx = (idx+1) % flagged_locations_count;
     return method;
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index cdddf36..77d6599 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -95,8 +95,7 @@ static bool match(const uchar* found, const char* target, uint len)
     // (normalize it to be without the zero-terminating symbol)
     if (len > 0 && found[len-1] == '\0')
         --len;
-    // 0 means anything, "" means empty
-    return !found || (qstrncmp((const char *)found, target, len) == 0 && target[len] == '\0');
+    return (memcmp(found, target, len) == 0 && target[len] == '\0');
 }
 
 static uint elfHash(const char *name)
@@ -765,8 +764,6 @@ void QTranslatorPrivate::clear()
 }
 
 /*!
-    \since 4.5
-
     Returns the translation for the key (\a context, \a sourceText,
     \a disambiguation). If none is found, also tries (\a context, \a
     sourceText, ""). If that still fails, returns an empty string.
diff --git a/src/corelib/thread/qmutexpool.cpp b/src/corelib/thread/qmutexpool.cpp
index 71ecab5..96a9940 100644
--- a/src/corelib/thread/qmutexpool.cpp
+++ b/src/corelib/thread/qmutexpool.cpp
@@ -96,9 +96,8 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMutexPool, globalMutexPool, (true))
     QMutexPool is destructed.
 */
 QMutexPool::QMutexPool(bool recursive, int size)
-    : count(size), recurs(recursive)
+    : mutexes(size), count(size), recurs(recursive)
 {
-    mutexes = new QMutex*[count];
     for (int index = 0; index < count; ++index) {
         mutexes[index] = 0;
     }
@@ -110,13 +109,10 @@ QMutexPool::QMutexPool(bool recursive, int size)
 */
 QMutexPool::~QMutexPool()
 {
-    QMutexLocker locker(&mutex);
     for (int index = 0; index < count; ++index) {
         delete mutexes[index];
         mutexes[index] = 0;
     }
-    delete [] mutexes;
-    mutexes = 0;
 }
 
 /*!
@@ -138,12 +134,9 @@ QMutex *QMutexPool::get(const void *address)
 
     if (!mutexes[index]) {
         // mutex not created, create one
-
-        QMutexLocker locker(&mutex);
-        // we need to check once again that the mutex hasn't been created, since
-        // 2 threads could be trying to create a mutex at the same index...
-        if (!mutexes[index])
-            mutexes[index] = new QMutex(recurs ? QMutex::Recursive : QMutex::NonRecursive);
+        QMutex *newMutex = new QMutex(recurs ? QMutex::Recursive : QMutex::NonRecursive);
+        if (!mutexes[index].testAndSetOrdered(0, newMutex))
+            delete newMutex;
     }
 
     return mutexes[index];
diff --git a/src/corelib/thread/qmutexpool_p.h b/src/corelib/thread/qmutexpool_p.h
index 65a3b54..1009ebb 100644
--- a/src/corelib/thread/qmutexpool_p.h
+++ b/src/corelib/thread/qmutexpool_p.h
@@ -53,7 +53,9 @@
 // We mean it.
 //
 
+#include "QtCore/qatomic.h"
 #include "QtCore/qmutex.h"
+#include "QtCore/qvarlengtharray.h"
 
 #ifndef QT_NO_THREAD
 
@@ -70,8 +72,7 @@ public:
     static QMutex *globalInstanceGet(const void *address);
 
 private:
-    QMutex mutex;
-    QMutex **mutexes;
+    QVarLengthArray<QAtomicPointer<QMutex>, 128> mutexes;
     int count;
     bool recurs;
 };