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

Conflicts:
	src/plugins/platforms/xcb/qxcbnativeinterface.cpp
	src/plugins/platforms/xcb/qxcbnativeinterface.h

Change-Id: I31b38ba439b9341d51a01c0fd54bea33f7410076

1 files changed, 5 insertions, 8 deletions

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index bdbb49ff51..6f00abfc5f 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -4626,7 +4626,7 @@ void QPainter::drawLines(const QPointF *pointPairs, int lineCount)
 {
     Q_ASSERT(sizeof(QLineF) == 2*sizeof(QPointF));
 
-    drawLines((QLineF*)pointPairs, lineCount);
+    drawLines((const QLineF*)pointPairs, lineCount);
 }
 
 /*!
@@ -4639,7 +4639,7 @@ void QPainter::drawLines(const QPoint *pointPairs, int lineCount)
 {
     Q_ASSERT(sizeof(QLine) == 2*sizeof(QPoint));
 
-    drawLines((QLine*)pointPairs, lineCount);
+    drawLines((const QLine*)pointPairs, lineCount);
 }
 
 
@@ -5565,22 +5565,19 @@ void QPainter::drawGlyphRun(const QPointF &position, const QGlyphRun &glyphRun)
         fixedPointPositions[i] = QFixedPoint::fromPointF(processedPosition);
     }
 
-    d->drawGlyphs(glyphIndexes, fixedPointPositions.data(), count, font, glyphRun.overline(),
-                  glyphRun.underline(), glyphRun.strikeOut());
+    d->drawGlyphs(glyphIndexes, fixedPointPositions.data(), count, fontD->fontEngine,
+                  glyphRun.overline(), glyphRun.underline(), glyphRun.strikeOut());
 }
 
 void QPainterPrivate::drawGlyphs(const quint32 *glyphArray, QFixedPoint *positions,
                                  int glyphCount,
-                                 const QRawFont &font, bool overline, bool underline,
+                                 QFontEngine *fontEngine, bool overline, bool underline,
                                  bool strikeOut)
 {
     Q_Q(QPainter);
 
     updateState(state);
 
-    QRawFontPrivate *fontD = QRawFontPrivate::get(font);
-    QFontEngine *fontEngine = fontD->fontEngine;
-
     QFixed leftMost;
     QFixed rightMost;
     QFixed baseLine;