Merge branch '4.8-upstream' into master-water

8 files changed, 167 insertions, 48 deletions

diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index dfc90e8..692c78c 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -408,13 +408,26 @@ bool QTranslator::load(const QString & filename, const QString & directory,
     Q_D(QTranslator);
     d->clear();
 
+    QString fname = filename;
     QString prefix;
     if (QFileInfo(filename).isRelative()) {
 #ifdef Q_OS_SYMBIAN
-        if (directory.isEmpty())
+        //TFindFile doesn't like path in the filename
+        QString dir(directory);
+        int slash = filename.lastIndexOf(QLatin1Char('/'));
+        slash = qMax(slash, filename.lastIndexOf(QLatin1Char('\\')));
+        if (slash >=0) {
+            //so move the path component into the directory prefix
+            if (dir.isEmpty())
+                dir = filename.left(slash + 1);
+            else
+                dir = dir + QLatin1Char('/') + filename.left(slash + 1);
+            fname = fname.mid(slash + 1);
+        }
+        if (dir.isEmpty())
             prefix = QCoreApplication::applicationDirPath();
         else
-            prefix = QFileInfo(directory).absoluteFilePath(); //TFindFile doesn't like dirty paths
+            prefix = QFileInfo(dir).absoluteFilePath(); //TFindFile doesn't like dirty paths
         if (prefix.length() > 2 && prefix.at(1) == QLatin1Char(':') && prefix.at(0).isLetter())
             prefix[0] = QLatin1Char('Y');
 #else
@@ -428,7 +441,6 @@ bool QTranslator::load(const QString & filename, const QString & directory,
     QString nativePrefix = QDir::toNativeSeparators(prefix);
 #endif
 
-    QString fname = filename;
     QString realname;
     QString delims;
     delims = search_delimiters.isNull() ? QString::fromLatin1("_.") : search_delimiters;
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index 3557425..b23ac73 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -90,8 +90,9 @@ public:
     ~QDeclarativePixmapReply();
 
     QDeclarativePixmapData *data;
-    QDeclarativePixmapReader *reader;
+    QDeclarativeEngine *engineForReader; // always access reader inside readerMutex.
     QSize requestSize;
+    QUrl url;
 
     bool loading;
     int redirectCount;
@@ -147,6 +148,7 @@ public:
     void cancel(QDeclarativePixmapReply *rep);
 
     static QDeclarativePixmapReader *instance(QDeclarativeEngine *engine);
+    static QDeclarativePixmapReader *existingInstance(QDeclarativeEngine *engine);
 
 protected:
     void run();
@@ -176,6 +178,7 @@ private:
     static int downloadProgress;
     static int threadNetworkRequestDone;
     static QHash<QDeclarativeEngine *,QDeclarativePixmapReader*> readers;
+public:
     static QMutex readerMutex;
 };
 
@@ -326,6 +329,22 @@ QDeclarativePixmapReader::~QDeclarativePixmapReader()
     readers.remove(engine);
     readerMutex.unlock();
 
+    mutex.lock();
+    // manually cancel all outstanding jobs.
+    foreach (QDeclarativePixmapReply *reply, jobs) {
+        delete reply;
+    }
+    jobs.clear();
+    QList<QDeclarativePixmapReply*> activeJobs = replies.values();
+    foreach (QDeclarativePixmapReply *reply, activeJobs) {
+        if (reply->loading) {
+            cancelled.append(reply);
+            reply->data = 0;
+        }
+    }
+    if (threadObject) threadObject->processJobs();
+    mutex.unlock();
+
     eventLoopQuitHack->deleteLater();
     wait();
 }
@@ -433,9 +452,8 @@ void QDeclarativePixmapReader::processJobs()
         if (!jobs.isEmpty() && replies.count() < IMAGEREQUEST_MAX_REQUEST_COUNT) {
             QDeclarativePixmapReply *runningJob = jobs.takeLast();
             runningJob->loading = true;
-
-            QUrl url = runningJob->data->url;
-            QSize requestSize = runningJob->data->requestSize;
+            QUrl url = runningJob->url;
+            QSize requestSize = runningJob->requestSize;
             locker.unlock();
             processJob(runningJob, url, requestSize);
             locker.relock();
@@ -459,7 +477,6 @@ void QDeclarativePixmapReader::processJob(QDeclarativePixmapReply *runningJob, c
             errorCode = QDeclarativePixmapReply::Loading;
             errorStr = QDeclarativePixmap::tr("Failed to get image from provider: %1").arg(url.toString());
         }
-
         mutex.lock();
         if (!cancelled.contains(runningJob)) runningJob->postReply(errorCode, errorStr, readSize, image);
         mutex.unlock();
@@ -487,10 +504,8 @@ void QDeclarativePixmapReader::processJob(QDeclarativePixmapReply *runningJob, c
             QNetworkRequest req(url);
             req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
             QNetworkReply *reply = networkAccessManager()->get(req);
-
             QMetaObject::connect(reply, replyDownloadProgress, runningJob, downloadProgress);
             QMetaObject::connect(reply, replyFinished, threadObject, threadNetworkRequestDone);
-
             replies.insert(reply, runningJob);
         }
     }
@@ -498,22 +513,27 @@ void QDeclarativePixmapReader::processJob(QDeclarativePixmapReply *runningJob, c
 
 QDeclarativePixmapReader *QDeclarativePixmapReader::instance(QDeclarativeEngine *engine)
 {
-    readerMutex.lock();
+    // XXX NOTE: must be called within readerMutex locking.
     QDeclarativePixmapReader *reader = readers.value(engine);
     if (!reader) {
         reader = new QDeclarativePixmapReader(engine);
         readers.insert(engine, reader);
     }
-    readerMutex.unlock();
 
     return reader;
 }
 
+QDeclarativePixmapReader *QDeclarativePixmapReader::existingInstance(QDeclarativeEngine *engine)
+{
+    // XXX NOTE: must be called within readerMutex locking.
+    return readers.value(engine, 0);
+}
+
 QDeclarativePixmapReply *QDeclarativePixmapReader::getImage(QDeclarativePixmapData *data)
 {
     mutex.lock();
     QDeclarativePixmapReply *reply = new QDeclarativePixmapReply(data);
-    reply->reader = this;
+    reply->engineForReader = engine;
     jobs.append(reply);
     // XXX 
     if (threadObject) threadObject->processJobs();
@@ -692,7 +712,7 @@ void QDeclarativePixmapStore::flushCache()
 }
 
 QDeclarativePixmapReply::QDeclarativePixmapReply(QDeclarativePixmapData *d)
-: data(d), reader(0), requestSize(d->requestSize), loading(false), redirectCount(0)
+: data(d), engineForReader(0), requestSize(d->requestSize), url(d->url), loading(false), redirectCount(0)
 {
     if (finishedIndex == -1) {
         finishedIndex = QDeclarativePixmapReply::staticMetaObject.indexOfSignal("finished()");
@@ -750,8 +770,14 @@ void QDeclarativePixmapData::release()
 
     if (refCount == 0) {
         if (reply) {
-            reply->reader->cancel(reply);
+            QDeclarativePixmapReply *cancelReply = reply;
+            reply->data = 0;
             reply = 0;
+            QDeclarativePixmapReader::readerMutex.lock();
+            QDeclarativePixmapReader *reader = QDeclarativePixmapReader::existingInstance(cancelReply->engineForReader);
+            if (reader)
+                reader->cancel(cancelReply);
+            QDeclarativePixmapReader::readerMutex.unlock();
         }
 
         if (pixmapStatus == QDeclarativePixmap::Ready) {
@@ -1013,13 +1039,12 @@ void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const
         if (!engine)
             return;
 
-        QDeclarativePixmapReader *reader = QDeclarativePixmapReader::instance(engine);
-
         d = new QDeclarativePixmapData(url, requestSize);
         if (options & QDeclarativePixmap::Cache)
             d->addToCache();
-
-        d->reply = reader->getImage(d);
+        QDeclarativePixmapReader::readerMutex.lock();
+        d->reply = QDeclarativePixmapReader::instance(engine)->getImage(d);
+        QDeclarativePixmapReader::readerMutex.unlock();
     } else {
         d = *iter;
         d->addref();
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 73e8eed..9ea0b83 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1157,7 +1157,6 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent, const Q
             if (q_ptr == fsi || q_ptr->isAncestorOf(fsi)) {
                 parentFocusScopeItem = fsi;
                 p->d_ptr->focusScopeItem = 0;
-                fsi->d_ptr->focusScopeItemChange(false);
             }
             break;
         }
@@ -1261,6 +1260,10 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent, const Q
     if (!inDestructor && (transformData || (newParent && newParent->d_ptr->transformData)))
         transformChanged();
 
+    // Reparenting is finished, now safe to notify the previous focusScopeItem about changes
+    if (parentFocusScopeItem)
+      parentFocusScopeItem->d_ptr->focusScopeItemChange(false);
+
     // Restore the sub focus chain.
     if (subFocusItem) {
         subFocusItem->d_ptr->setSubFocus(newParent);
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 98c33da..c3362ae 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -1336,40 +1336,12 @@ QPoint QWidgetPrivate::mapFromGlobal(const QPoint &pos) const
 QPoint QWidget::mapToGlobal(const QPoint &pos) const
 {
     Q_D(const QWidget);
-    QPoint offset = data->crect.topLeft();
-    const QWidget *w = this;
-    const QWidget *p = w->parentWidget();
-    while (!w->isWindow() && p) {
-        w = p;
-        p = p->parentWidget();
-        offset += w->data->crect.topLeft();
-    }
-
-    const QWidgetPrivate *wd = w->d_func();
-    QTLWExtra *tlw = wd->topData();
-    if (!tlw->embedded)
-        return pos + offset;
-
     return d->mapToGlobal(pos);
 }
 
 QPoint QWidget::mapFromGlobal(const QPoint &pos) const
 {
     Q_D(const QWidget);
-    QPoint offset = data->crect.topLeft();
-    const QWidget *w = this;
-    const QWidget *p = w->parentWidget();
-    while (!w->isWindow() && p) {
-        w = p;
-        p = p->parentWidget();
-        offset += w->data->crect.topLeft();
-    }
-
-    const QWidgetPrivate *wd = w->d_func();
-    QTLWExtra *tlw = wd->topData();
-    if (!tlw->embedded)
-        return pos - offset;
-
     return d->mapFromGlobal(pos);
 }
 
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index 8f0e602..4d6252f 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -4552,6 +4552,107 @@ QRect QMacStyle::subElementRect(SubElement sr, const QStyleOption *opt,
                 rect.setTop(rect.top() + SIZE(6 /* AHIG */, 3 /* guess */, 2 /* AHIG */));
         }
         break;
+#ifndef QT_NO_DOCKWIDGET
+        case SE_DockWidgetCloseButton:
+        case SE_DockWidgetFloatButton:
+        case SE_DockWidgetTitleBarText:
+        case SE_DockWidgetIcon: {
+            int iconSize = proxy()->pixelMetric(PM_SmallIconSize, opt, widget);
+            int buttonMargin = proxy()->pixelMetric(PM_DockWidgetTitleBarButtonMargin, opt, widget);
+            QRect srect = opt->rect;
+
+            const QStyleOptionDockWidget *dwOpt
+                = qstyleoption_cast<const QStyleOptionDockWidget*>(opt);
+            bool canClose = dwOpt == 0 ? true : dwOpt->closable;
+            bool canFloat = dwOpt == 0 ? false : dwOpt->floatable;
+            const QStyleOptionDockWidgetV2 *v2
+                = qstyleoption_cast<const QStyleOptionDockWidgetV2*>(opt);
+            bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
+
+            // If this is a vertical titlebar, we transpose and work as if it was
+            // horizontal, then transpose again.
+            if (verticalTitleBar) {
+                QSize size = srect.size();
+                size.transpose();
+                srect.setSize(size);
+            }
+
+            do {
+                int right = srect.right();
+                int left = srect.left();
+
+                QRect closeRect;
+                if (canClose) {
+                    QSize sz = standardIcon(QStyle::SP_TitleBarCloseButton,
+                                            opt, widget).actualSize(QSize(iconSize, iconSize));
+                    sz += QSize(buttonMargin, buttonMargin);
+                    if (verticalTitleBar)
+                        sz.transpose();
+                    closeRect = QRect(left,
+                                      srect.center().y() - sz.height()/2,
+                                      sz.width(), sz.height());
+                    left = closeRect.right() + 1;
+                }
+                if (sr == SE_DockWidgetCloseButton) {
+                    rect = closeRect;
+                    break;
+                }
+
+                QRect floatRect;
+                if (canFloat) {
+                    QSize sz = standardIcon(QStyle::SP_TitleBarNormalButton,
+                                            opt, widget).actualSize(QSize(iconSize, iconSize));
+                    sz += QSize(buttonMargin, buttonMargin);
+                    if (verticalTitleBar)
+                        sz.transpose();
+                    floatRect = QRect(left,
+                                      srect.center().y() - sz.height()/2,
+                                      sz.width(), sz.height());
+                    left = floatRect.right() + 1;
+                }
+                if (sr == SE_DockWidgetFloatButton) {
+                    rect = floatRect;
+                    break;
+                }
+
+                QRect iconRect;
+                if (const QDockWidget *dw = qobject_cast<const QDockWidget*>(widget)) {
+                    QIcon icon;
+                    if (dw->isFloating())
+                        icon = dw->windowIcon();
+                    if (!icon.isNull()
+                        && icon.cacheKey() != QApplication::windowIcon().cacheKey()) {
+                        QSize sz = icon.actualSize(QSize(rect.height(), rect.height()));
+                        if (verticalTitleBar)
+                            sz.transpose();
+                        iconRect = QRect(right - sz.width(), srect.center().y() - sz.height()/2,
+                                         sz.width(), sz.height());
+                        right = iconRect.left() - 1;
+                    }
+                }
+                if (sr == SE_DockWidgetIcon) {
+                    rect = iconRect;
+                    break;
+                }
+
+                QRect textRect = QRect(left, srect.top(),
+                                       right - left, srect.height());
+                if (sr == SE_DockWidgetTitleBarText) {
+                    rect = textRect;
+                    break;
+                }
+            } while (false);
+
+            if (verticalTitleBar) {
+                rect = QRect(srect.left() + rect.top() - srect.top(),
+                          srect.top() + srect.right() - rect.right(),
+                          rect.height(), rect.width());
+            } else {
+                rect = visualRect(opt->direction, srect, rect);
+            }
+            break;
+        }
+#endif
     default:
         rect = QWindowsStyle::subElementRect(sr, opt, widget);
         break;
diff --git a/src/gui/styles/qwindowsvistastyle.cpp b/src/gui/styles/qwindowsvistastyle.cpp
index 5525468..8051014 100644
--- a/src/gui/styles/qwindowsvistastyle.cpp
+++ b/src/gui/styles/qwindowsvistastyle.cpp
@@ -2508,6 +2508,7 @@ QWindowsVistaStylePrivate::QWindowsVistaStylePrivate() :
 
 QWindowsVistaStylePrivate::~QWindowsVistaStylePrivate()
 {
+    qDeleteAll(animations);
     delete m_treeViewHelper;
 }
 
diff --git a/src/imports/shaders/shadereffect.cpp b/src/imports/shaders/shadereffect.cpp
index f40d6b8..a5164e2 100644
--- a/src/imports/shaders/shadereffect.cpp
+++ b/src/imports/shaders/shadereffect.cpp
@@ -61,6 +61,7 @@ ShaderEffect::~ShaderEffect()
 
 void ShaderEffect::prepareBufferedDraw(QPainter *painter)
 {
+#ifndef QT_NO_DYNAMIC_CAST
     // This workaround needed because QGraphicsEffect seems to always utilize default painters worldtransform
     // instead of the active painters worldtransform.
     const ShaderEffectBuffer *effectBuffer = dynamic_cast<ShaderEffectBuffer*> (painter->device());
@@ -70,6 +71,9 @@ void ShaderEffect::prepareBufferedDraw(QPainter *painter)
     } else {
         savedWorldTransform = painter->worldTransform();
     }
+#else
+    Q_UNUSED(painter);
+#endif
 }
 
 void ShaderEffect::draw (QPainter *painter)
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 15fda34..b9db7fe 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -788,6 +788,7 @@ void QHttpNetworkConnectionChannel::detectPipeliningSupport()
             && (!serverHeaderField.contains("Netscape-Enterprise/3."))
             // this is adpoted from the knowledge of the Nokia 7.x browser team (DEF143319)
             && (!serverHeaderField.contains("WebLogic"))
+            && (!serverHeaderField.startsWith("Rocket")) // a Python Web Server, see Web2py.com
             ) {
         pipeliningSupported = QHttpNetworkConnectionChannel::PipeliningProbablySupported;
     } else {