Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Id13badc270db98806048753fd7fb658aa17f1ede

5 files changed, 6 insertions, 4 deletions

diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 5d28512697..dffdfa889a 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -1313,6 +1313,8 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
     if (!m_object)
         return m_uniqueId;
     QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(m_object);
+    if (!iface)
+        return 0;
     if (m_child != -1)
         iface = iface->child(m_child);
     return QAccessible::uniqueId(iface);
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index be634b2462..61d524841d 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -1426,7 +1426,7 @@ qreal QImage::devicePixelRatio() const
 }
 
 /*!
-    Sets the the device pixel ratio for the image. This is the
+    Sets the device pixel ratio for the image. This is the
     ratio between image pixels and device-independent pixels.
 
     The default \a scaleFactor is 1.0. Setting it to something else has
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 208fcec078..86c4dfbdca 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -665,7 +665,7 @@ qreal QPixmap::devicePixelRatio() const
 }
 
 /*!
-    Sets the the device pixel ratio for the pixmap. This is the
+    Sets the device pixel ratio for the pixmap. This is the
     ratio between image pixels and device-independent pixels.
 
     The default \a scaleFactor is 1.0. Setting it to something else has
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index b953f8d81f..e340c1e613 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -160,7 +160,7 @@ bool QTextureGlyphCache::populate(QFontEngine *fontEngine, int numGlyphs, const
         // proper metrics will be cached and used later.
         if (fontEngine->hasInternalCaching()) {
             QImage *locked = fontEngine->lockedAlphaMapForGlyph(glyph, subPixelPosition, format);
-            if (locked)
+            if (locked && !locked->isNull())
                 fontEngine->unlockAlphaMapForGlyph();
         }
 
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 4e1c8c4c4a..06c5e24920 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -954,12 +954,12 @@ void QTextEngine::shapeText(int item) const
                 itemBoundaries.append(i);
                 itemBoundaries.append(glyph_pos);
 
-                lastEngine = engineIdx;
                 QFontEngine *actualFontEngine = static_cast<QFontEngineMulti *>(fontEngine)->engine(engineIdx);
                 si.ascent = qMax(actualFontEngine->ascent(), si.ascent);
                 si.descent = qMax(actualFontEngine->descent(), si.descent);
                 si.leading = qMax(actualFontEngine->leading(), si.leading);
             }
+            lastEngine = engineIdx;
             if (QChar::isHighSurrogate(string[i]) && i + 1 < itemLength && QChar::isLowSurrogate(string[i + 1]))
                 ++i;
         }