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

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  optimize ligatureHelper by using qBinaryFind instead of the for loop
  QFileSystemWatcher:  Do not require QApplication in the destructor.
  Do not define METHOD if QT_NO_KEYWORD is defined.
  QThreadPrivate::finish should not keep mutex locked when calling signals
  Make QThreadStorage supports value type and not only pointers.
  QThreadStorage: fix memory leak if thread storage are added while destroying
  Compile fix.
  Fix some warnings on Mac

16 files changed, 110 insertions, 85 deletions

diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp
index 18c3c9f..3a7d795 100644
--- a/src/corelib/io/qfilesystemwatcher.cpp
+++ b/src/corelib/io/qfilesystemwatcher.cpp
@@ -198,7 +198,7 @@ QStringList QPollingFileSystemWatcherEngine::removePaths(const QStringList &path
 
 void QPollingFileSystemWatcherEngine::stop()
 {
-    QMetaObject::invokeMethod(this, "quit");
+    quit();
 }
 
 void QPollingFileSystemWatcherEngine::timeout()
@@ -426,11 +426,6 @@ QFileSystemWatcher::QFileSystemWatcher(const QStringList &paths, QObject *parent
 
 /*!
     Destroys the file system watcher.
-
-    \note To avoid deadlocks on shutdown, all instances of QFileSystemWatcher
-    need to be destroyed before QCoreApplication. Note that passing
-    QCoreApplication::instance() as the parent object when creating
-    QFileSystemWatcher is not sufficient.
 */
 QFileSystemWatcher::~QFileSystemWatcher()
 {
diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp
index dc18ae7..939eb73 100644
--- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
@@ -340,7 +340,7 @@ QStringList QInotifyFileSystemWatcherEngine::removePaths(const QStringList &path
 
 void QInotifyFileSystemWatcherEngine::stop()
 {
-    QMetaObject::invokeMethod(this, "quit");
+    quit();
 }
 
 void QInotifyFileSystemWatcherEngine::readFromInotify()
diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp
index 6136742..ee66c36 100644
--- a/src/corelib/io/qfilesystemwatcher_symbian.cpp
+++ b/src/corelib/io/qfilesystemwatcher_symbian.cpp
@@ -215,7 +215,7 @@ void QSymbianFileSystemWatcherEngine::emitPathChanged(QNotifyChangeEvent *e)
 
 void QSymbianFileSystemWatcherEngine::stop()
 {
-    QMetaObject::invokeMethod(this, "quit");
+    quit();
     wait();
 }
 
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index db46ba5..b4e4aa5 100644
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -215,11 +215,15 @@ Q_CORE_EXPORT const char *qFlagLocation(const char *method);
 #define QTOSTRING(s) QTOSTRING_HELPER(s)
 #ifndef QT_NO_DEBUG
 # define QLOCATION "\0"__FILE__":"QTOSTRING(__LINE__)
-# define METHOD(a)   qFlagLocation("0"#a QLOCATION)
+# ifndef QT_NO_KEYWORDS
+#  define METHOD(a)   qFlagLocation("0"#a QLOCATION)
+# endif
 # define SLOT(a)     qFlagLocation("1"#a QLOCATION)
 # define SIGNAL(a)   qFlagLocation("2"#a QLOCATION)
 #else
-# define METHOD(a)   "0"#a
+# ifndef QT_NO_KEYWORDS
+#  define METHOD(a)   "0"#a
+# endif
 # define SLOT(a)     "1"#a
 # define SIGNAL(a)   "2"#a
 #endif
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index adbbad2..3a3c2bb 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -334,40 +334,44 @@ void QThreadPrivate::finish(void *arg)
 {
     QThread *thr = reinterpret_cast<QThread *>(arg);
     QThreadPrivate *d = thr->d_func();
+
 #ifdef Q_OS_SYMBIAN
-    if (lockAnyway)
+    QMutexLocker locker(lockAnyway ? &d->mutex : 0);
+#else
+    QMutexLocker locker(&d->mutex);
 #endif
-        d->mutex.lock();
+
 
     d->priority = QThread::InheritPriority;
-    d->running = false;
-    d->finished = true;
-    if (d->terminated)
+    bool terminated = d->terminated;
+    void *data = &d->data->tls;
+    locker.unlock();
+    if (terminated)
         emit thr->terminated();
-    d->terminated = false;
     emit thr->finished();
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+    QThreadStorageData::finish((void **)data);
+    locker.relock();
+    d->terminated = false;
 
-    if (d->data->eventDispatcher) {
-        d->data->eventDispatcher->closingDown();
-        QAbstractEventDispatcher *eventDispatcher = d->data->eventDispatcher;
+    QAbstractEventDispatcher *eventDispatcher = d->data->eventDispatcher;
+    if (eventDispatcher) {
         d->data->eventDispatcher = 0;
+        locker.unlock();
+        eventDispatcher->closingDown();
         delete eventDispatcher;
+        locker.relock();
     }
 
-    void *data = &d->data->tls;
-    QThreadStorageData::finish((void **)data);
-
     d->thread_id = 0;
 #ifdef Q_OS_SYMBIAN
     if (closeNativeHandle)
         d->data->symbian_thread_handle.Close();
 #endif
+    d->running = false;
+    d->finished = true;
+
     d->thread_done.wakeAll();
-#ifdef Q_OS_SYMBIAN
-    if (lockAnyway)
-#endif
-        d->mutex.unlock();
 }
 
 
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
index 4a967ed..3706da8 100644
--- a/src/corelib/thread/qthread_win.cpp
+++ b/src/corelib/thread/qthread_win.cpp
@@ -323,25 +323,32 @@ void QThreadPrivate::finish(void *arg, bool lockAnyway)
     QThread *thr = reinterpret_cast<QThread *>(arg);
     QThreadPrivate *d = thr->d_func();
 
-    if (lockAnyway)
-        d->mutex.lock();
+    QMutexLocker locker(lockAnyway ? &d->mutex : 0);
     d->priority = QThread::InheritPriority;
-    d->running = false;
-    d->finished = true;
-    if (d->terminated)
+    bool terminated = d->terminated;
+    void **tls_data = reinterpret_cast<void **>(&d->data->tls);
+    locker.unlock();
+    if (terminated)
         emit thr->terminated();
-    d->terminated = false;
     emit thr->finished();
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+    QThreadStorageData::finish(tls_data);
+    locker.relock();
+
+    d->terminated = false;
 
-    if (d->data->eventDispatcher) {
-        d->data->eventDispatcher->closingDown();
-        QAbstractEventDispatcher *eventDispatcher = d->data->eventDispatcher;
+    QAbstractEventDispatcher *eventDispatcher = d->data->eventDispatcher;
+    if (eventDispatcher) {
         d->data->eventDispatcher = 0;
+        locker.unlock();
+        eventDispatcher->closingDown();
         delete eventDispatcher;
+        locker.relock();
     }
 
-    QThreadStorageData::finish(reinterpret_cast<void **>(&d->data->tls));
+    d->running = false;
+    d->finished = true;
+
 
     if (!d->waiters) {
         CloseHandle(d->handle);
@@ -350,8 +357,6 @@ void QThreadPrivate::finish(void *arg, bool lockAnyway)
 
     d->id = 0;
 
-    if (lockAnyway)
-        d->mutex.unlock();
 }
 
 /**************************************************************************
diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp
index 2fc04f5..8df6f39 100644
--- a/src/corelib/thread/qthreadstorage.cpp
+++ b/src/corelib/thread/qthreadstorage.cpp
@@ -178,11 +178,12 @@ void QThreadStorageData::finish(void **p)
         return; // nothing to do
 
     DEBUG_MSG("QThreadStorageData: Destroying storage for thread %p", QThread::currentThread());
-
-    for(int i = tls->size() - 1; i >= 0; i--) {
-        void *&value = (*tls)[i];
+    while (!tls->isEmpty()) {
+        void *&value = tls->last();
         void *q = value;
         value = 0;
+        int i = tls->size() - 1;
+        tls->resize(i);
 
         if (!q) {
             // data already deleted
@@ -215,19 +216,18 @@ void QThreadStorageData::finish(void **p)
     QThreadStorage is a template class that provides per-thread data
     storage.
 
-    \e{Note that due to compiler limitations, QThreadStorage can only
-    store pointers.}
-
     The setLocalData() function stores a single thread-specific value
     for the calling thread. The data can be accessed later using
-    localData(). QThreadStorage takes ownership of the data (which
-    must be created on the heap with \c new) and deletes it when the
-    thread exits, either normally or via termination.
+    localData().
 
     The hasLocalData() function allows the programmer to determine if
     data has previously been set using the setLocalData() function.
     This is also useful for lazy initializiation.
 
+    If T is a pointer type, QThreadStorage takes ownership of the data
+    (which must be created on the heap with \c new) and deletes it when
+    the thread exits, either normally or via termination.
+
     For example, the following code uses QThreadStorage to store a
     single cache for each thread that calls the cacheObject() and
     removeFromCache() functions. The cache is automatically
@@ -241,9 +241,6 @@ void QThreadStorageData::finish(void **p)
 
     \list
 
-    \o As noted above, QThreadStorage can only store pointers due to
-    compiler limitations.
-
     \o The QThreadStorage destructor does not delete per-thread data.
     QThreadStorage only deletes per-thread data when the thread exits
     or when setLocalData() is called multiple times.
@@ -279,8 +276,11 @@ void QThreadStorageData::finish(void **p)
 /*!
     \fn bool QThreadStorage::hasLocalData() const
 
-    Returns true if the calling thread has non-zero data available;
-    otherwise returns false.
+    If T is a pointer type, returns true if the calling thread has
+    non-zero data available.
+
+    If T is a value type, returns wether the data has already been
+    constructed by calling setLocalData or localData.
 
     \sa localData()
 */
@@ -291,10 +291,8 @@ void QThreadStorageData::finish(void **p)
     Returns a reference to the data that was set by the calling
     thread.
 
-    Note: QThreadStorage can only store pointers. This function
-    returns a reference to the pointer that was set by the calling
-    thread. The value of this reference is 0 if no data was set by
-    the calling thread,
+    If no data has been set, this will create a default constructed
+    instance of type T.
 
     \sa hasLocalData()
 */
@@ -305,10 +303,6 @@ void QThreadStorageData::finish(void **p)
 
     Returns a copy of the data that was set by the calling thread.
 
-    Note: QThreadStorage can only store pointers. This function
-    returns a pointer to the data that was set by the calling thread.
-    If no data was set by the calling thread, this function returns 0.
-
     \sa hasLocalData()
 */
 
@@ -318,19 +312,9 @@ void QThreadStorageData::finish(void **p)
     Sets the local data for the calling thread to \a data. It can be
     accessed later using the localData() functions.
 
-    If \a data is 0, this function deletes the previous data (if
-    any) and returns immediately.
-
-    If \a data is non-zero, QThreadStorage takes ownership of the \a
-    data and deletes it automatically either when the thread exits
-    (either normally or via termination) or when setLocalData() is
-    called again.
-
-    Note: QThreadStorage can only store pointers. The \a data
-    argument must be either a pointer to an object created on the heap
-    (i.e. using \c new) or 0. You should not delete \a data
-    yourself; QThreadStorage takes ownership and will delete the \a
-    data itself.
+    If T is a pointer type, QThreadStorage takes ownership of the data
+    and deletes it automatically either when the thread exits (either
+    normally or via termination) or when setLocalData() is called again.
 
     \sa localData(), hasLocalData()
 */
diff --git a/src/corelib/thread/qthreadstorage.h b/src/corelib/thread/qthreadstorage.h
index 6264674..475d20d 100644
--- a/src/corelib/thread/qthreadstorage.h
+++ b/src/corelib/thread/qthreadstorage.h
@@ -91,6 +91,11 @@ inline
 void qThreadStorage_setLocalData(QThreadStorageData &d, T **t)
 { (void) d.set(*t); }
 
+template <typename T>
+inline
+void qThreadStorage_deleteData(void *d, T **)
+{ delete static_cast<T *>(d); }
+
 // value-based specialization
 template <typename T>
 inline
@@ -114,6 +119,12 @@ inline
 void qThreadStorage_setLocalData(QThreadStorageData &d, T *t)
 { (void) d.set(new T(*t)); }
 
+template <typename T>
+inline
+void qThreadStorage_deleteData(void *d, T *)
+{ delete static_cast<T *>(d); }
+
+
 // MOC_SKIP_END
 #endif
 
@@ -126,7 +137,7 @@ private:
     Q_DISABLE_COPY(QThreadStorage)
 
     static inline void deleteData(void *x)
-    { delete static_cast<T>(x); }
+    { qThreadStorage_deleteData(x, reinterpret_cast<T*>(0)); }
 
 public:
     inline QThreadStorage() : d(deleteData) { }
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index bb777cd..43b1552 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -48,11 +48,11 @@
 #  undef QT_NO_CAST_TO_ASCII
 #endif
 #include "qchar.h"
+
 #include "qdatastream.h"
 #include "qtextcodec.h"
 
 #include "qunicodetables_p.h"
-
 #include "qunicodetables.cpp"
 
 QT_BEGIN_NAMESPACE
@@ -1489,6 +1489,16 @@ static void decomposeHelper(QString *str, bool canonical, QChar::UnicodeVersion
 }
 
 
+struct UCS2Pair {
+    ushort u1;
+    ushort u2;
+};
+
+static inline bool operator<(ushort u1, const UCS2Pair &ligature)
+{ return u1 < ligature.u1; }
+static inline bool operator<(const UCS2Pair &ligature, ushort u1)
+{ return ligature.u1 < u1; }
+
 static ushort ligatureHelper(ushort u1, ushort u2)
 {
     // hangul L-V pair
@@ -1511,12 +1521,14 @@ static ushort ligatureHelper(ushort u1, ushort u2)
     if (index == 0xffff)
         return 0;
     const unsigned short *ligatures = uc_ligature_map+index;
-    ushort length = *ligatures;
-    ++ligatures;
-    // ### use bsearch
-    for (uint i = 0; i < length; ++i)
-        if (ligatures[2*i] == u1)
-            return ligatures[2*i+1];
+    ushort length = *ligatures++;
+    {
+        const UCS2Pair *data = reinterpret_cast<const UCS2Pair *>(ligatures);
+        const UCS2Pair *r = qBinaryFind(data, data + length, u1);
+        if (r != data + length)
+            return r->u2;
+    }
+
     return 0;
 }
 
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index bb496c6..c30af64 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -714,7 +714,7 @@ const QString::Null QString::null = { };
     formats, the \e precision represents the maximum number of
     significant digits (trailing zeroes are omitted).
 
-    \section1 More Efficient String Construction 
+    \section1 More Efficient String Construction
 
     Using the QString \c{'+'} operator, it is easy to construct a
     complex string from multiple substrings. You will often write code
@@ -924,7 +924,7 @@ int QString::grow(int size)
 /*!
     \since 4.2
 
-    Returns a copy of the \a string, where the encoding of \a string depends on 
+    Returns a copy of the \a string, where the encoding of \a string depends on
     the size of wchar. If wchar is 4 bytes, the \a string is interpreted as ucs-4,
     if wchar is 2 bytes it is interpreted as ucs-2.
 
@@ -3606,7 +3606,7 @@ static QByteArray toLatin1_helper(const QChar *data, int length)
             }
             length = length % 16;
         }
-#elif QT_ALWAYS_HAVE_NEON
+#elif defined(QT_ALWAYS_HAVE_NEON)
         // Refer to the documentation of the SSE2 implementation
         // this use eactly the same method as for SSE except:
         // 1) neon has unsigned comparison
diff --git a/src/gui/dialogs/qcolordialog_mac.mm b/src/gui/dialogs/qcolordialog_mac.mm
index 82cfa24..f2e4d53 100644
--- a/src/gui/dialogs/qcolordialog_mac.mm
+++ b/src/gui/dialogs/qcolordialog_mac.mm
@@ -439,7 +439,7 @@ void QColorDialogPrivate::openCocoaColorPanel(const QColor &initial,
             priv:this];
         [colorPanel setDelegate:static_cast<QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate) *>(delegate)];
     }
-    [delegate setResultSet:false];
+    [static_cast<QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate) *>(delegate) setResultSet:NO];
     setCocoaPanelColor(initial);
     [static_cast<QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate) *>(delegate) showColorPanel];
 }
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index 0f7872e..c154740 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -256,6 +256,8 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format, bool /*
     case QImage::Format_ARGB4444_Premultiplied:
         cgflags = kCGImageAlphaPremultipliedFirst;
         break;
+    default:
+        break;
     }
 
 #ifdef kCGBitmapByteOrder32Host //only needed because CGImage.h added symbols in the minor version
diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
index 9b07d64..383f05e 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
+++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
@@ -78,6 +78,7 @@
 
 #import <private/qcocoaapplicationdelegate_mac_p.h>
 #import <private/qcocoamenuloader_mac_p.h>
+#import <private/qcocoaapplication_mac_p.h>
 #include <private/qapplication_p.h>
 #include <private/qt_mac_p.h>
 #include <private/qt_cocoa_helpers_mac_p.h>
diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index 3ebfab2..be8f794 100644
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -2456,6 +2456,8 @@ QDebug operator<<(QDebug debug, QStyle::State state)
     qSort(states);
     debug << states.join(QLatin1String(" | "));
     debug << ')';
+#else
+    Q_UNUSED(state);
 #endif
     return debug;
 }
diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp
index 4780edf..05ca793 100644
--- a/src/gui/styles/qstyleoption.cpp
+++ b/src/gui/styles/qstyleoption.cpp
@@ -5483,6 +5483,8 @@ QDebug operator<<(QDebug debug, const QStyleOption::OptionType &optionType)
     case QStyleOption::SO_GraphicsItem:
         debug << "SO_GraphicsItem"; break;
     }
+#else
+    Q_UNUSED(optionType);
 #endif
     return debug;
 }
@@ -5496,6 +5498,8 @@ QDebug operator<<(QDebug debug, const QStyleOption &option)
     debug << ',' << option.state;
     debug << ',' << option.rect;
     debug << ')';
+#else
+    Q_UNUSED(option);
 #endif
     return debug;
 }
diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm
index b670186..a22148e 100644
--- a/src/gui/widgets/qcocoamenu_mac.mm
+++ b/src/gui/widgets/qcocoamenu_mac.mm
@@ -44,6 +44,7 @@
 #ifdef QT_MAC_USE_COCOA
 #import <private/qcocoamenu_mac_p.h>
 #import <private/qcocoamenuloader_mac_p.h>
+#import <private/qcocoaapplication_mac_p.h>
 #include <private/qt_cocoa_helpers_mac_p.h>
 #include <private/qapplication_p.h>
 #include <private/qaction_p.h>