Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  QPointer: thread safety
  Make sure num_glyphs pass to HarfBuzz is large enough
  Corrected documentation for QImage::fill().
  Fix transformed QPainter::drawGlyphs() for certain paint engines

4 files changed, 27 insertions, 9 deletions

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 7fe9c52..c3102ea 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -408,6 +408,8 @@ void QMetaObject::removeGuard(QObject **ptr)
     if (!hash || hash->isEmpty())
         return;
     QMutexLocker locker(guardHashLock());
+    if (!*ptr) //check again, under the lock
+        return;
     GuardHash::iterator it = hash->find(*ptr);
     const GuardHash::iterator end = hash->end();
     bool more = false; //if the QObject has more pointer attached to it.
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index bb94788c..897cb64 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -2018,11 +2018,11 @@ void QImage::fill(Qt::GlobalColor color)
     Fills the entire image with the given \a color.
 
     If the depth of the image is 1, the image will be filled with 1 if
-    \a color equals Qt::color0; it will otherwise be filled with 0.
+    \a color equals Qt::color1; it will otherwise be filled with 0.
 
     If the depth of the image is 8, the image will be filled with the
     index corresponding the \a color in the color table if present; it
-    will otherwise be filled with 0.|
+    will otherwise be filled with 0.
 
     \since 4.8
 */
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 546861a..e8db049 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -151,6 +151,13 @@ static inline uint line_emulation(uint emulation)
                         | QPaintEngine_OpaqueBackground);
 }
 
+static bool qt_paintengine_supports_transformations(QPaintEngine::Type type)
+{
+    return type == QPaintEngine::OpenGL2
+            || type == QPaintEngine::OpenVG
+            || type == QPaintEngine::OpenGL;
+}
+
 #ifndef QT_NO_DEBUG
 static bool qt_painter_thread_test(int devType, const char *what, bool extraCondition = false)
 {
@@ -5795,8 +5802,17 @@ void QPainter::drawGlyphs(const QPointF &position, const QGlyphs &glyphs)
 
     int count = qMin(glyphIndexes.size(), glyphPositions.size());
     QVarLengthArray<QFixedPoint, 128> fixedPointPositions(count);
-    for (int i=0; i<count; ++i)
-        fixedPointPositions[i] = QFixedPoint::fromPointF(position + glyphPositions.at(i));
+
+    bool paintEngineSupportsTransformations =
+            d->extended != 0
+            ? qt_paintengine_supports_transformations(d->extended->type())
+            : false;
+    for (int i=0; i<count; ++i) {
+        QPointF processedPosition = position + glyphPositions.at(i);
+        if (!paintEngineSupportsTransformations)
+            processedPosition = d->state->transform().map(processedPosition);
+        fixedPointPositions[i] = QFixedPoint::fromPointF(processedPosition);
+    }
 
     d->drawGlyphs(glyphIndexes.data(), fixedPointPositions.data(), count);
 
@@ -5988,10 +6004,7 @@ void QPainter::drawStaticText(const QPointF &topLeftPosition, const QStaticText
         return;
     }
 
-    bool paintEngineSupportsTransformations = d->extended->type() == QPaintEngine::OpenGL2
-                                           || d->extended->type() == QPaintEngine::OpenVG
-                                           || d->extended->type() == QPaintEngine::OpenGL;
-
+    bool paintEngineSupportsTransformations = qt_paintengine_supports_transformations(d->extended->type());
     if (paintEngineSupportsTransformations && !staticText_d->untransformedCoordinates) {
         staticText_d->untransformedCoordinates = true;
         staticText_d->needsRelayout = true;
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 06eed55..96379e6 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1233,6 +1233,8 @@ void QTextEngine::shapeTextWithHarfbuzz(int item) const
             shaper_item.num_glyphs -= itemBoundaries[k + 1];
         }
         shaper_item.initialGlyphCount = shaper_item.num_glyphs;
+        if (shaper_item.num_glyphs < shaper_item.item.length)
+            shaper_item.num_glyphs = shaper_item.item.length;
 
         QFontEngine *actualFontEngine = font;
         uint engineIdx = 0;
@@ -1257,7 +1259,8 @@ void QTextEngine::shapeTextWithHarfbuzz(int item) const
             }
 
             const QGlyphLayout g = availableGlyphs(&si).mid(glyph_pos);
-            moveGlyphData(g.mid(shaper_item.num_glyphs), g.mid(shaper_item.initialGlyphCount), remaining_glyphs);
+            if (shaper_item.num_glyphs > shaper_item.item.length)
+                moveGlyphData(g.mid(shaper_item.num_glyphs), g.mid(shaper_item.initialGlyphCount), remaining_glyphs);
 
             shaper_item.glyphs = g.glyphs;
             shaper_item.attributes = g.attributes;