Merge branch '4.8-upstream' into master-water

6 files changed, 34 insertions, 19 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 0c218fc..9092593 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -5378,11 +5378,9 @@ void QGraphicsItemPrivate::invalidateParentGraphicsEffectsRecursively()
 {
     QGraphicsItemPrivate *itemPrivate = this;
     do {
-        if (itemPrivate->graphicsEffect) {
+        if (itemPrivate->graphicsEffect && !itemPrivate->updateDueToGraphicsEffect) {
             itemPrivate->notifyInvalidated = 1;
-
-            if (!itemPrivate->updateDueToGraphicsEffect)
-                static_cast<QGraphicsItemEffectSourcePrivate *>(itemPrivate->graphicsEffect->d_func()->source->d_func())->invalidateCache();
+            static_cast<QGraphicsItemEffectSourcePrivate *>(itemPrivate->graphicsEffect->d_func()->source->d_func())->invalidateCache();
         }
     } while ((itemPrivate = itemPrivate->parent ? itemPrivate->parent->d_ptr.data() : 0));
 }
@@ -5690,21 +5688,27 @@ void QGraphicsItem::update(const QRectF &rect)
     d_ptr->invalidateParentGraphicsEffectsRecursively();
 #endif //QT_NO_GRAPHICSEFFECT
 
-    if (CacheMode(d_ptr->cacheMode) != NoCache) {
-        // Invalidate cache.
-        QGraphicsItemCache *cache = d_ptr->extraItemCache();
-        if (!cache->allExposed) {
-            if (rect.isNull()) {
-                cache->allExposed = true;
-                cache->exposed.clear();
-            } else {
-                cache->exposed.append(rect);
+#ifndef QT_NO_GRAPHICSEFFECT
+    if (!d_ptr->updateDueToGraphicsEffect) {
+#endif
+        if (CacheMode(d_ptr->cacheMode) != NoCache) {
+            // Invalidate cache.
+            QGraphicsItemCache *cache = d_ptr->extraItemCache();
+            if (!cache->allExposed) {
+                if (rect.isNull()) {
+                    cache->allExposed = true;
+                    cache->exposed.clear();
+                } else {
+                    cache->exposed.append(rect);
+                }
             }
+            // Only invalidate cache; item is already dirty.
+            if (d_ptr->fullUpdatePending)
+                return;
         }
-        // Only invalidate cache; item is already dirty.
-        if (d_ptr->fullUpdatePending)
-            return;
+#ifndef QT_NO_GRAPHICSEFFECT
     }
+#endif
 
     if (d_ptr->scene)
         d_ptr->scene->d_func()->markDirty(this, rect);
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 1551944..867880c 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -3504,7 +3504,9 @@ bool QGraphicsScene::event(QEvent *event)
         }
         break;
     case QEvent::WindowDeactivate:
-        if (!--d->activationRefCount) {
+        if (d->activationRefCount > 0)
+            --d->activationRefCount;
+        if (!d->activationRefCount) {
             if (d->activePanel) {
                 // Deactivate the active panel (but keep it so we can
                 // reactivate it later).
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index b16e51e..c275968 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -1173,6 +1173,12 @@ QVariant QGraphicsWidget::itemChange(GraphicsItemChange change, const QVariant &
         QApplication::sendEvent(this, &event);
         break;
     }
+    case ItemChildAddedChange: {
+        QGraphicsItem *child = qVariantValue<QGraphicsItem *>(value);
+        if (child->isWidget())
+            static_cast<QGraphicsWidget *>(child)->d_func()->resolveLayoutDirection();
+        break;
+    }
     default:
         break;
     }
diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp
index 61bc63e..7c7d4eb 100644
--- a/src/gui/text/qrawfont.cpp
+++ b/src/gui/text/qrawfont.cpp
@@ -238,7 +238,8 @@ void QRawFont::loadFromData(const QByteArray &fontData,
    If \a antialiasingType is set to QRawFont::SubPixelAntialiasing, then the resulting image will be
    in QImage::Format_RGB32 and the RGB values of each pixel will represent the subpixel opacities of
    the pixel in the rasterization of the glyph. Otherwise, the image will be in the format of
-   QImage::Format_A8 and each pixel will contain the opacity of the pixel in the rasterization.
+   QImage::Format_Indexed8 and each pixel will contain the opacity of the pixel in the
+   rasterization.
 
    \sa pathForGlyph(), QPainter::drawGlyphRun()
 */
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index 067e81d..9362022 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -629,7 +629,6 @@ public:
     int lineNumberForTextPosition(int pos);
     int positionAfterVisualMovement(int oldPos, QTextCursor::MoveOperation op);
     void insertionPointsForLine(int lineNum, QVector<int> &insertionPoints);
-
     void resetFontEngineCache();
 
 private:
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 83c3676..d0c1a0e 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -2507,6 +2507,9 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
 
     int pos = *cursorPos;
     int itm;
+    const HB_CharAttributes *attributes = eng->attributes();
+    while (pos < line.from + line.length && !attributes[pos].charStop)
+        pos++;
     if (pos == line.from + (int)line.length) {
         // end of line ensure we have the last item on the line
         itm = eng->findItem(pos-1);