Merge branch '4.6'

Conflicts:
	tools/assistant/lib/qhelpsearchquerywidget.cpp

7 files changed, 94 insertions, 68 deletions

diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp
index ea807db..19b493d 100644
--- a/src/corelib/animation/qpropertyanimation.cpp
+++ b/src/corelib/animation/qpropertyanimation.cpp
@@ -256,7 +256,8 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState,
     Q_D(QPropertyAnimation);
 
     if (!d->target && oldState == Stopped) {
-        qWarning("QPropertyAnimation::updateState: Changing state of an animation without target");
+        qWarning("QPropertyAnimation::updateState (%s): Changing state of an animation without target",
+                 d->propertyName.constData());
         return;
     }
 
@@ -281,10 +282,16 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState,
             if (oldState == Stopped) {
                 d->setDefaultStartEndValue(d->targetValue->property(d->propertyName.constData()));
                 //let's check if we have a start value and an end value
-                if (!startValue().isValid() && (d->direction == Backward || !d->defaultStartEndValue.isValid()))
-                    qWarning("QPropertyAnimation::updateState: starting an animation without start value");
-                if (!endValue().isValid() && (d->direction == Forward || !d->defaultStartEndValue.isValid()))
-                    qWarning("QPropertyAnimation::updateState: starting an animation without end value");
+                if (!startValue().isValid() && (d->direction == Backward || !d->defaultStartEndValue.isValid())) {
+                    qWarning("QPropertyAnimation::updateState (%s, %s, %s): starting an animation without start value",
+                             d->propertyName.constData(), d->target.data()->metaObject()->className(),
+                             qPrintable(d->target.data()->objectName()));
+                }
+                if (!endValue().isValid() && (d->direction == Forward || !d->defaultStartEndValue.isValid())) {
+                    qWarning("QPropertyAnimation::updateState (%s, %s, %s): starting an animation without end value",
+                             d->propertyName.constData(), d->target.data()->metaObject()->className(),
+                             qPrintable(d->target.data()->objectName()));
+                }
             }
         } else if (hash.value(key) == this) {
             hash.remove(key);
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index 4c7f3f0..728c316 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -650,7 +650,7 @@ QFile::remove()
             unsetError();
             return true;
         }
-        d->setError(QFile::RemoveError, fileEngine()->errorString());
+        d->setError(QFile::RemoveError, d->fileEngine->errorString());
     }
     return false;
 }
@@ -704,7 +704,7 @@ QFile::rename(const QString &newName)
         if (fileEngine()->rename(newName)) {
             unsetError();
             // engine was able to handle the new name so we just reset it
-            fileEngine()->setFileName(newName);
+            d->fileEngine->setFileName(newName);
             d->fileName = newName;
             return true;
         }
@@ -740,7 +740,7 @@ QFile::rename(const QString &newName)
                 if (error) {
                     out.remove();
                 } else {
-                    fileEngine()->setFileName(newName);
+                    d->fileEngine->setFileName(newName);
                     setPermissions(permissions());
                     unsetError();
                     setFileName(newName);
@@ -805,7 +805,7 @@ QFile::link(const QString &linkName)
         unsetError();
         return true;
     }
-    d->setError(QFile::RenameError, fileEngine()->errorString());
+    d->setError(QFile::RenameError, d->fileEngine->errorString());
     return false;
 }
 
@@ -994,10 +994,10 @@ bool QFile::open(OpenMode mode)
             seek(size());
         return true;
     }
-    QFile::FileError err = fileEngine()->error();
+    QFile::FileError err = d->fileEngine->error();
     if(err == QFile::UnspecifiedError)
         err = QFile::OpenError;
-    d->setError(err, fileEngine()->errorString());
+    d->setError(err, d->fileEngine->errorString());
     return false;
 }
 
@@ -1152,12 +1152,11 @@ bool QFile::open(int fd, OpenMode mode)
 int
 QFile::handle() const
 {
-    if (!isOpen())
+    Q_D(const QFile);
+    if (!isOpen() || !d->fileEngine)
         return -1;
 
-    if (QAbstractFileEngine *engine = fileEngine())
-        return engine->handle();
-    return -1;
+    return d->fileEngine->handle();
 }
 
 /*!
@@ -1189,13 +1188,12 @@ QFile::handle() const
 uchar *QFile::map(qint64 offset, qint64 size, MemoryMapFlags flags)
 {
     Q_D(QFile);
-    QAbstractFileEngine *engine = fileEngine();
-    if (engine
-        && engine->supportsExtension(QAbstractFileEngine::MapExtension)) {
+    if (fileEngine()
+            && d->fileEngine->supportsExtension(QAbstractFileEngine::MapExtension)) {
         unsetError();
-        uchar *address = engine->map(offset, size, flags);
+        uchar *address = d->fileEngine->map(offset, size, flags);
         if (address == 0)
-            d->setError(engine->error(), engine->errorString());
+            d->setError(d->fileEngine->error(), d->fileEngine->errorString());
         return address;
     }
     return 0;
@@ -1212,13 +1210,12 @@ uchar *QFile::map(qint64 offset, qint64 size, MemoryMapFlags flags)
 bool QFile::unmap(uchar *address)
 {
     Q_D(QFile);
-    QAbstractFileEngine *engine = fileEngine();
-    if (engine
-        && engine->supportsExtension(QAbstractFileEngine::UnMapExtension)) {
+    if (fileEngine()
+        && d->fileEngine->supportsExtension(QAbstractFileEngine::UnMapExtension)) {
         unsetError();
-        bool success = engine->unmap(address);
+        bool success = d->fileEngine->unmap(address);
         if (!success)
-            d->setError(engine->error(), engine->errorString());
+            d->setError(d->fileEngine->error(), d->fileEngine->errorString());
         return success;
     }
     return false;
@@ -1251,13 +1248,14 @@ QFile::resize(qint64 sz)
     Q_D(QFile);
     if (!d->ensureFlushed())
         return false;
-    if (isOpen() && fileEngine()->pos() > sz)
+    fileEngine();
+    if (isOpen() && d->fileEngine->pos() > sz)
         seek(sz);
-    if(fileEngine()->setSize(sz)) {
+    if(d->fileEngine->setSize(sz)) {
         unsetError();
         return true;
     }
-    d->setError(QFile::ResizeError, fileEngine()->errorString());
+    d->setError(QFile::ResizeError, d->fileEngine->errorString());
     return false;
 }
 
@@ -1321,7 +1319,7 @@ QFile::setPermissions(Permissions permissions)
         unsetError();
         return true;
     }
-    d->setError(QFile::PermissionsError, fileEngine()->errorString());
+    d->setError(QFile::PermissionsError, d->fileEngine->errorString());
     return false;
 }
 
@@ -1354,23 +1352,27 @@ bool
 QFile::flush()
 {
     Q_D(QFile);
+    if (!d->fileEngine) {
+        qWarning("QFile::flush: No file engine. Is IODevice open?");
+        return false;
+    }
+
     if (!d->writeBuffer.isEmpty()) {
         qint64 size = d->writeBuffer.size();
-        if (_qfile_writeData(d->fileEngine ? d->fileEngine : fileEngine(),
-                             &d->writeBuffer) != size) {
-            QFile::FileError err = fileEngine()->error();
+        if (_qfile_writeData(d->fileEngine, &d->writeBuffer) != size) {
+            QFile::FileError err = d->fileEngine->error();
             if(err == QFile::UnspecifiedError)
                 err = QFile::WriteError;
-            d->setError(err, fileEngine()->errorString());
+            d->setError(err, d->fileEngine->errorString());
             return false;
         }
     }
 
-    if (!fileEngine()->flush()) {
-        QFile::FileError err = fileEngine()->error();
+    if (!d->fileEngine->flush()) {
+        QFile::FileError err = d->fileEngine->error();
         if(err == QFile::UnspecifiedError)
             err = QFile::WriteError;
-        d->setError(err, fileEngine()->errorString());
+        d->setError(err, d->fileEngine->errorString());
         return false;
     }
     return true;
@@ -1395,10 +1397,10 @@ QFile::close()
     d->writeBuffer.clear();
 
     // keep earlier error from flush
-    if (fileEngine()->close() && flushed)
+    if (d->fileEngine->close() && flushed)
         unsetError();
     else if (flushed)
-        d->setError(fileEngine()->error(), fileEngine()->errorString());
+        d->setError(d->fileEngine->error(), d->fileEngine->errorString());
 }
 
 /*!
@@ -1451,10 +1453,10 @@ bool QFile::atEnd() const
         return false;
 
     // If the file engine knows best, say what it says.
-    if (fileEngine()->supportsExtension(QAbstractFileEngine::AtEndExtension)) {
+    if (d->fileEngine->supportsExtension(QAbstractFileEngine::AtEndExtension)) {
         // Check if the file engine supports AtEndExtension, and if it does,
         // check if the file engine claims to be at the end.
-        return fileEngine()->atEnd();
+        return d->fileEngine->atEnd();
     }
 
     // Fall back to checking how much is available (will stat files).
@@ -1476,11 +1478,11 @@ bool QFile::seek(qint64 off)
     if (!d->ensureFlushed())
         return false;
 
-    if (!fileEngine()->seek(off) || !QIODevice::seek(off)) {
-        QFile::FileError err = fileEngine()->error();
+    if (!d->fileEngine->seek(off) || !QIODevice::seek(off)) {
+        QFile::FileError err = d->fileEngine->error();
         if(err == QFile::UnspecifiedError)
             err = QFile::PositionError;
-        d->setError(err, fileEngine()->errorString());
+        d->setError(err, d->fileEngine->errorString());
         return false;
     }
     unsetError();
@@ -1496,8 +1498,8 @@ qint64 QFile::readLineData(char *data, qint64 maxlen)
     if (!d->ensureFlushed())
         return -1;
 
-    if (fileEngine()->supportsExtension(QAbstractFileEngine::FastReadLineExtension))
-        return fileEngine()->readLine(data, maxlen);
+    if (d->fileEngine->supportsExtension(QAbstractFileEngine::FastReadLineExtension))
+        return d->fileEngine->readLine(data, maxlen);
 
     // Fall back to QIODevice's readLine implementation if the engine
     // cannot do it faster.
@@ -1515,18 +1517,14 @@ qint64 QFile::readData(char *data, qint64 len)
     if (!d->ensureFlushed())
         return -1;
 
-    qint64 ret = -1;
-    qint64 read = fileEngine()->read(data, len);
-    if (read != -1)
-        ret = read;
-
-    if(ret < 0) {
-        QFile::FileError err = fileEngine()->error();
+    qint64 read = d->fileEngine->read(data, len);
+    if(read < 0) {
+        QFile::FileError err = d->fileEngine->error();
         if(err == QFile::UnspecifiedError)
             err = QFile::ReadError;
-        d->setError(err, fileEngine()->errorString());
+        d->setError(err, d->fileEngine->errorString());
     }
-    return ret;
+    return read;
 }
 
 /*!
@@ -1606,13 +1604,12 @@ QFile::writeData(const char *data, qint64 len)
     // Write directly to the engine if the block size is larger than
     // the write buffer size.
     if (!buffered || len > QFILE_WRITEBUFFER_SIZE) {
-        QAbstractFileEngine *fe = d->fileEngine ? d->fileEngine : fileEngine();
-        qint64 ret = fe->write(data, len);
+        qint64 ret = d->fileEngine->write(data, len);
         if(ret < 0) {
-            QFile::FileError err = fileEngine()->error();
+            QFile::FileError err = d->fileEngine->error();
             if(err == QFile::UnspecifiedError)
                 err = QFile::WriteError;
-            d->setError(err, fileEngine()->errorString());
+            d->setError(err, d->fileEngine->errorString());
         }
         return ret;
     }
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index 1b167e2..3f69b4f 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -107,13 +107,13 @@ QT_BEGIN_NAMESPACE
     \value ApplicationLayoutDirectionChange The default application layout direction has changed.
     \value ApplicationPaletteChange         The default application palette has changed.
     \value ApplicationWindowIconChange      The application's icon has changed.
-    \value CloseSoftwareInputPanel          A widget wants to close the software input panel (SIP).
     \value ChildAdded                       An object gets a child (QChildEvent).
     \value ChildInserted                    An object gets a child (QChildEvent). Qt3Support only, use ChildAdded instead.
     \value ChildPolished                    A widget child gets polished (QChildEvent).
     \value ChildRemoved                     An object loses a child (QChildEvent).
     \value Clipboard                        The clipboard contents have changed (QClipboardEvent).
     \value Close                            Widget was closed (QCloseEvent).
+    \value CloseSoftwareInputPanel          A widget wants to close the software input panel (SIP).
     \value ContentsRectChange               The margins of the widget's content rect changed.
     \value ContextMenu                      Context popup menu (QContextMenuEvent).
     \value CursorChange                     The widget's cursor has changed.
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h
index 4bd924e..a176149 100644
--- a/src/corelib/kernel/qmetaobject_p.h
+++ b/src/corelib/kernel/qmetaobject_p.h
@@ -130,14 +130,16 @@ struct QMetaObjectPrivate
 
 #ifndef QT_NO_QOBJECT
     //defined in qobject.cpp
+    enum DisconnectType { DisconnectAll, DisconnectOne };
     static bool connect(const QObject *sender, int signal_index,
                         const QObject *receiver, int method_index,
                         int type = 0, int *types = 0);
     static bool disconnect(const QObject *sender, int signal_index,
-                           const QObject *receiver, int method_index);
+                           const QObject *receiver, int method_index,
+                           DisconnectType = DisconnectAll);
     static inline bool disconnectHelper(QObjectPrivate::Connection *c,
                                         const QObject *receiver, int method_index,
-                                        QMutex *senderMutex);
+                                        QMutex *senderMutex, DisconnectType);
 #endif
 };
 
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index def9b86..761b31f 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2959,7 +2959,6 @@ bool QMetaObjectPrivate::connect(const QObject *sender, int signal_index,
     return true;
 }
 
-
 /*!\internal
  */
 bool QMetaObject::disconnect(const QObject *sender, int signal_index,
@@ -2970,12 +2969,27 @@ bool QMetaObject::disconnect(const QObject *sender, int signal_index,
                                           receiver, method_index);
 }
 
+/*!\internal
+
+Disconnect a single signal connection.  If QMetaObject::connect() has been called 
+multiple times for the same sender, signal_index, receiver and method_index only 
+one of these connections will be removed.
+ */
+bool QMetaObject::disconnectOne(const QObject *sender, int signal_index,
+                                const QObject *receiver, int method_index)
+{
+    signal_index = methodIndexToSignalIndex(sender->metaObject(), signal_index);
+    return QMetaObjectPrivate::disconnect(sender, signal_index,
+                                          receiver, method_index,
+                                          QMetaObjectPrivate::DisconnectOne);
+}
+
 /*! \internal
     Helper function to remove the connection from the senders list and setting the receivers to 0
  */
 bool QMetaObjectPrivate::disconnectHelper(QObjectPrivate::Connection *c,
                                           const QObject *receiver, int method_index,
-                                          QMutex *senderMutex)
+                                          QMutex *senderMutex, DisconnectType disconnectType)
 {
     bool success = false;
     while (c) {
@@ -3001,6 +3015,9 @@ bool QMetaObjectPrivate::disconnectHelper(QObjectPrivate::Connection *c,
             c->receiver = 0;
 
             success = true;
+
+            if (disconnectType == DisconnectOne)
+                return success;
         }
         c = c->nextConnectionList;
     }
@@ -3011,7 +3028,8 @@ bool QMetaObjectPrivate::disconnectHelper(QObjectPrivate::Connection *c,
     Same as the QMetaObject::disconnect, but \a signal_index must be the result of QObjectPrivate::signalIndex
  */
 bool QMetaObjectPrivate::disconnect(const QObject *sender, int signal_index,
-                                    const QObject *receiver, int method_index)
+                                    const QObject *receiver, int method_index,
+                                    DisconnectType disconnectType)
 {
     if (!sender)
         return false;
@@ -3035,7 +3053,7 @@ bool QMetaObjectPrivate::disconnect(const QObject *sender, int signal_index,
         for (signal_index = -1; signal_index < connectionLists->count(); ++signal_index) {
             QObjectPrivate::Connection *c =
                 (*connectionLists)[signal_index].first;
-            if (disconnectHelper(c, receiver, method_index, senderMutex)) {
+            if (disconnectHelper(c, receiver, method_index, senderMutex, disconnectType)) {
                 success = true;
                 connectionLists->dirty = true;
             }
@@ -3043,7 +3061,7 @@ bool QMetaObjectPrivate::disconnect(const QObject *sender, int signal_index,
     } else if (signal_index < connectionLists->count()) {
         QObjectPrivate::Connection *c =
             (*connectionLists)[signal_index].first;
-        if (disconnectHelper(c, receiver, method_index, senderMutex)) {
+        if (disconnectHelper(c, receiver, method_index, senderMutex, disconnectType)) {
             success = true;
             connectionLists->dirty = true;
         }
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index a0d9cf3..8ed7f3f 100644
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -334,6 +334,8 @@ struct Q_CORE_EXPORT QMetaObject
     // internal index-based disconnect
     static bool disconnect(const QObject *sender, int signal_index,
                            const QObject *receiver, int method_index);
+    static bool disconnectOne(const QObject *sender, int signal_index,
+                              const QObject *receiver, int method_index);
     // internal slot-name based connect
     static void connectSlotsByName(QObject *o);
 
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index ba5ef5d..5dc931b 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -538,7 +538,7 @@ QByteArray qUncompress(const uchar* data, int nbytes)
 
     forever {
         ulong alloc = len;
-        d.reset(q_check_ptr(static_cast<QByteArray::Data *>(qRealloc(d.data(), sizeof(QByteArray::Data) + alloc))));
+        d.reset(q_check_ptr(static_cast<QByteArray::Data *>(qRealloc(d.take(), sizeof(QByteArray::Data) + alloc))));
         if (!d) {
             // we are not allowed to crash here when compiling with QT_NO_EXCEPTIONS
             qWarning("qUncompress: could not allocate enough memory to uncompress data");
@@ -551,7 +551,7 @@ QByteArray qUncompress(const uchar* data, int nbytes)
         switch (res) {
         case Z_OK:
             if (len != alloc) {
-                d.reset(q_check_ptr(static_cast<QByteArray::Data *>(qRealloc(d.data(), sizeof(QByteArray::Data) + len))));
+                d.reset(q_check_ptr(static_cast<QByteArray::Data *>(qRealloc(d.take(), sizeof(QByteArray::Data) + len))));
                 if (!d) {
                     // we are not allowed to crash here when compiling with QT_NO_EXCEPTIONS
                     qWarning("qUncompress: could not allocate enough memory to uncompress data");