Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

12 files changed, 89 insertions, 64 deletions

diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp
index 7526a81..5f224aa 100644
--- a/src/corelib/animation/qpropertyanimation.cpp
+++ b/src/corelib/animation/qpropertyanimation.cpp
@@ -100,10 +100,6 @@
 
 QT_BEGIN_NAMESPACE
 
-typedef QPair<QObject *, QByteArray> QPropertyAnimationPair;
-typedef QHash<QPropertyAnimationPair, QPropertyAnimation*> QPropertyAnimationHash;
-Q_GLOBAL_STATIC(QPropertyAnimationHash, _q_runningAnimations)
-
 void QPropertyAnimationPrivate::updateMetaProperty()
 {
     if (!target || propertyName.isEmpty())
@@ -286,19 +282,21 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State oldState,
 
     QPropertyAnimation *animToStop = 0;
     {
-        QPropertyAnimationHash * hash = _q_runningAnimations();
-        QMutexLocker locker(QMutexPool::globalInstanceGet(hash));
+        QMutexLocker locker(QMutexPool::globalInstanceGet(&staticMetaObject));
+        typedef QPair<QObject *, QByteArray> QPropertyAnimationPair;
+        typedef QHash<QPropertyAnimationPair, QPropertyAnimation*> QPropertyAnimationHash;
+        static QPropertyAnimationHash hash;
         QPropertyAnimationPair key(d->target, d->propertyName);
         if (newState == Running) {
             d->updateMetaProperty();
-            animToStop = hash->value(key, 0);
-            hash->insert(key, this);
+            animToStop = hash.value(key, 0);
+            hash.insert(key, this);
             // update the default start value
             if (oldState == Stopped) {
                 d->setDefaultStartValue(d->target->property(d->propertyName.constData()));
             }
-        } else if (hash->value(key) == this) {
-            hash->remove(key);
+        } else if (hash.value(key) == this) {
+            hash.remove(key);
         }
     }
 
diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp
index 1bf76ea..188ac8c 100644
--- a/src/corelib/codecs/qiconvcodec.cpp
+++ b/src/corelib/codecs/qiconvcodec.cpp
@@ -225,10 +225,11 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState
     char *inBytes = const_cast<char *>(chars);
 #endif
 
+    QByteArray in;
     if (remainingCount) {
         // we have to prepend the remaining bytes from the previous conversion
         inBytesLeft += remainingCount;
-        QByteArray in(inBytesLeft, Qt::Uninitialized);
+        in.resize(inBytesLeft);
         inBytes = in.data();
 
         memcpy(in.data(), remainingBuffer, remainingCount);
@@ -362,9 +363,10 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt
     inBytes = const_cast<char *>(reinterpret_cast<const char *>(uc));
     inBytesLeft = len * sizeof(QChar);
 
+    QByteArray in;
     if (convState && convState->remainingChars) {
         // we have one surrogate char to be prepended
-        QByteArray in(sizeof(QChar) + len, Qt::Uninitialized);
+        in.resize(sizeof(QChar) + len);
         inBytes = in.data();
 
         QChar remaining = convState->state_data[0];
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index a139a55..d6c708c 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2062,7 +2062,7 @@ public:
 
     inline bool operator!() const { return !i; }
 
-    inline bool testFlag(Enum f) const { return (i & f) == f; }
+    inline bool testFlag(Enum f) const { return (i & f) == f && (f != 0 || i == f ); }
 };
 
 #define Q_DECLARE_FLAGS(Flags, Enum)\
diff --git a/src/corelib/io/qbuffer.cpp b/src/corelib/io/qbuffer.cpp
index aed5b82..3883d30 100644
--- a/src/corelib/io/qbuffer.cpp
+++ b/src/corelib/io/qbuffer.cpp
@@ -452,7 +452,7 @@ qint64 QBuffer::writeData(const char *data, qint64 len)
 */
 void QBuffer::connectNotify(const char *signal)
 {
-    if (strcmp(signal + 1, "readyRead()") == 0 || strcmp(signal + 1, "bytesWritten(qint64)"))
+    if (strcmp(signal + 1, "readyRead()") == 0 || strcmp(signal + 1, "bytesWritten(qint64)") == 0)
         d_func()->signalConnectionCount++;
 }
 
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp
index a98d005..e2682f5 100644
--- a/src/corelib/kernel/qabstracteventdispatcher.cpp
+++ b/src/corelib/kernel/qabstracteventdispatcher.cpp
@@ -398,20 +398,23 @@ void QAbstractEventDispatcher::closingDown()
 */
 
 /*!
-    Sets the event filter \a filter. Returns a pointer to the filter
-    function previously defined.
-
-    The event filter is a function that receives all messages taken
-    from the system event loop before the event is dispatched to the
-    respective target. This includes messages that are not sent to Qt
+    Replaces the event filter function for this
+    QAbstractEventDispatcher with \a filter and returns the replaced
+    event filter function. Only the current event filter function is
+    called. If you want to use both filter functions, save the
+    replaced EventFilter in a place where yours can call it.
+
+    The event filter function set here is called for all messages
+    taken from the system event loop before the event is dispatched to
+    the respective target, including the messages not meant for Qt
     objects.
 
-    The function can return true to stop the event to be processed by
-    Qt, or false to continue with the standard event processing.
+    The event filter function should return true if the message should
+    be filtered, (i.e. stopped). It should return false to allow
+    processing the message to continue.
 
-    Only one filter can be defined, but the filter can use the return
-    value to call the previously set event filter. By default, no
-    filter is set (i.e. the function returns 0).
+    By default, no event filter function is set (i.e., this function
+    returns a null EventFilter the first time it is called).
 */
 QAbstractEventDispatcher::EventFilter QAbstractEventDispatcher::setEventFilter(EventFilter filter)
 {
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
index 1bf2425..8d43897 100644
--- a/src/corelib/kernel/qcore_unix_p.h
+++ b/src/corelib/kernel/qcore_unix_p.h
@@ -69,19 +69,19 @@
 
 struct sockaddr;
 
-QT_BEGIN_NAMESPACE
-
 #if defined(Q_OS_LINUX) && defined(O_CLOEXEC) && defined(__GLIBC__) && (__GLIBC__ * 0x100 + __GLIBC_MINOR__) >= 0x0204
 // Linux supports thread-safe FD_CLOEXEC
 # define QT_UNIX_SUPPORTS_THREADSAFE_CLOEXEC 1
 
+QT_BEGIN_NAMESPACE
 namespace QtLibcSupplement {
     Q_CORE_EXPORT int accept4(int, sockaddr *, QT_SOCKLEN_T *, int flags);
     Q_CORE_EXPORT int dup3(int oldfd, int newfd, int flags);
     Q_CORE_EXPORT int pipe2(int pipes[], int flags);
 }
+QT_END_NAMESPACE
+using namespace QT_PREPEND_NAMESPACE(QtLibcSupplement);
 
-using namespace QtLibcSupplement;
 #else
 # define QT_UNIX_SUPPORTS_THREADSAFE_CLOEXEC 0
 #endif
@@ -91,6 +91,7 @@ using namespace QtLibcSupplement;
         var = cmd;                              \
     } while (var == -1 && errno == EINTR)
 
+QT_BEGIN_NAMESPACE
 
 // don't call QT_OPEN or ::open
 // call qt_safe_open
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 054be70..706dc54 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2183,21 +2183,37 @@ void QCoreApplication::removeLibraryPath(const QString &path)
 /*!
     \fn EventFilter QCoreApplication::setEventFilter(EventFilter filter)
 
-    Sets the event filter \a filter. Returns a pointer to the filter
-    function previously defined.
-
-    The event filter is a function that is called for every message
-    received in all threads. This does \e not include messages to
+    Replaces the event filter function for the QCoreApplication with
+    \a filter and returns the pointer to the replaced event filter
+    function. Only the current event filter function is called. If you
+    want to use both filter functions, save the replaced EventFilter
+    in a place where yours can call it.
+
+    The event filter function set here is called for all messages
+    received by all threads meant for all Qt objects. It is \e not
+    called for messages that are not meant for Qt objects.
+
+    The event filter function should return true if the message should
+    be filtered, (i.e. stopped). It should return false to allow
+    processing the message to continue.
+
+    By default, no event filter function is set (i.e., this function
+    returns a null EventFilter the first time it is called).
+    
+    \note The filter function set here receives native messages,
+    i.e. MSG or XEvent structs, that are going to Qt objects. It is
+    called by QCoreApplication::filterEvent(). If the filter function
+    returns false to indicate the message should be processed further,
+    the native message can then be translated into a QEvent and
+    handled by the standard Qt \l{QEvent} {event} filering, e.g.
+    QObject::installEventFilter().
+
+    \note The filter function set here is different form the filter
+    function set via QAbstractEventDispatcher::setEventFilter(), which
+    gets all messages received by its thread, even messages meant for
     objects that are not handled by Qt.
 
-    The function can return true to stop the event to be processed by
-    Qt, or false to continue with the standard event processing.
-
-    Only one filter can be defined, but the filter can use the return
-    value to call the previously set event filter. By default, no
-    filter is set (i.e., the function returns 0).
-
-    \sa installEventFilter()
+    \sa QObject::installEventFilter(), QAbstractEventDispatcher::setEventFilter()
 */
 QCoreApplication::EventFilter
 QCoreApplication::setEventFilter(QCoreApplication::EventFilter filter)
diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h
index ff2b412..233b4f9 100644
--- a/src/corelib/plugin/qplugin.h
+++ b/src/corelib/plugin/qplugin.h
@@ -63,21 +63,6 @@ typedef QObject *(*QtPluginInstanceFunction)();
 
 void Q_CORE_EXPORT qRegisterStaticPluginInstanceFunction(QtPluginInstanceFunction function);
 
-struct qt_plugin_instance_deleter
-{
-    qt_plugin_instance_deleter(QPointer<QObject> &instance)
-        : instance_(instance)
-    {
-    }
-
-    ~qt_plugin_instance_deleter()
-    {
-        delete instance_;
-    }
-
-    QPointer<QObject> &instance_;
-};
-
 #define Q_IMPORT_PLUGIN(PLUGIN) \
         extern QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance_##PLUGIN(); \
         class Static##PLUGIN##PluginInstance{ \
@@ -91,10 +76,8 @@ struct qt_plugin_instance_deleter
 #define Q_PLUGIN_INSTANCE(IMPLEMENTATION) \
         { \
             static QT_PREPEND_NAMESPACE(QPointer)<QT_PREPEND_NAMESPACE(QObject)> _instance; \
-            if (!_instance) { \
-                static QT_PREPEND_NAMESPACE(qt_plugin_instance_deleter) deleter(_instance); \
+            if (!_instance)      \
                 _instance = new IMPLEMENTATION; \
-            } \
             return _instance; \
         }
 
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index 24522f2..2e31c6d 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -261,9 +261,14 @@ void QAdoptedThread::run()
     Returns the thread handle of the currently executing thread.
 
     \warning The handle returned by this function is used for internal
-    purposes and should not be used in any application code. On
-    Windows, the returned value is a pseudo-handle for the current
-    thread that cannot be used for numerical comparison.
+    purposes and should not be used in any application code.
+
+    \warning On Windows, the returned value is a pseudo-handle for the
+    current thread. It can't be used for numerical comparison. i.e.,
+    this function returns the DWORD (Windows-Thread ID) returned by
+    the Win32 function getCurrentThreadId(), not the HANDLE
+    (Windows-Thread HANDLE) returned by the Win32 function
+    getCurrentThread().
 */
 
 /*!
diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h
index f3daca7..008c068 100644
--- a/src/corelib/tools/qringbuffer_p.h
+++ b/src/corelib/tools/qringbuffer_p.h
@@ -303,6 +303,9 @@ public:
 
     // read an unspecified amount (will read the first buffer)
     inline QByteArray read() {
+        if (bufferSize == 0)
+            return QByteArray();
+
         // multiple buffers, just take the first one
         if (head == 0 && tailBuffer != 0) {
             QByteArray qba = buffers.takeFirst();
@@ -325,7 +328,7 @@ public:
         // We can avoid by initializing the QRingBuffer with basicBlockSize of 0
         // and only using this read() function.
         QByteArray qba(readPointer(), nextDataBlockSize());
-        buffers.takeFirst();
+        buffers.removeFirst();
         head = 0;
         if (tailBuffer == 0) {
             buffers << QByteArray();
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index 6bb0d8e..235c603 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -1235,6 +1235,8 @@ inline int QStringRef::localeAwareCompare(const QStringRef &s1, const QStringRef
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
 #ifdef QT_USE_FAST_CONCATENATION
 #include <QtCore/qstringbuilder.h>
 #endif
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h
index 852c072..3b43253 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/tools/qstringbuilder.h
@@ -69,7 +69,7 @@ private:
 };
 
 
-template <typename T> class QConcatenable {};
+template <typename T> struct QConcatenable {};
 
 template <typename A, typename B>
 class QStringBuilder
@@ -202,6 +202,18 @@ template <> struct QConcatenable<const char *>
             *out++ = QLatin1Char(*a++);
     }
 };
+
+template <> struct QConcatenable<QByteArray>
+{
+    typedef QByteArray type;
+    static int size(const QByteArray &ba) { return qstrnlen(ba.constData(), ba.size()); }
+    static inline void appendTo(const QByteArray &ba, QChar *&out)
+    {
+        const char *data = ba.constData();
+        while (*data)
+            *out++ = QLatin1Char(*data++);
+    }
+};
 #endif
 
 template <typename A, typename B>