Merge remote-tracking branch 'origin/5.6' into 5.7

This also reverts commit 018e670a26ff5a61b949100ae080f5e654e7bee8.

The change was introduced in 5.6. After the refactoring, 14960f52,
in 5.7 branch and a merge, it is not needed any more.

Conflicts:
	.qmake.conf
	src/corelib/io/qstandardpaths_mac.mm
	src/corelib/tools/qsharedpointer_impl.h
	tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp

Change-Id: If4fdff0ebf2b9b5df9f9db93ea0022d5ee3da2a4

8 files changed, 18 insertions, 16 deletions

diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index 8924a7c4ae..7c0492bb1a 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -829,7 +829,7 @@ void QFontEngine::addBitmapFontToPath(qreal x, qreal y, const QGlyphLayout &glyp
                 }
             }
         }
-        const uchar *bitmap_data = bitmap.bits();
+        const uchar *bitmap_data = bitmap.constBits();
         QFixedPoint offset = glyphs.offsets[i];
         advanceX += offset.x;
         advanceY += offset.y;
@@ -886,12 +886,12 @@ QImage QFontEngine::alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, con
 
 QImage QFontEngine::alphaRGBMapForGlyph(glyph_t glyph, QFixed /*subPixelPosition*/, const QTransform &t)
 {
-    QImage alphaMask = alphaMapForGlyph(glyph, t);
+    const QImage alphaMask = alphaMapForGlyph(glyph, t);
     QImage rgbMask(alphaMask.width(), alphaMask.height(), QImage::Format_RGB32);
 
     for (int y=0; y<alphaMask.height(); ++y) {
         uint *dst = (uint *) rgbMask.scanLine(y);
-        uchar *src = (uchar *) alphaMask.scanLine(y);
+        const uchar *src = alphaMask.constScanLine(y);
         for (int x=0; x<alphaMask.width(); ++x) {
             int val = src[x];
             dst[x] = qRgb(val, val, val);
@@ -979,7 +979,7 @@ QImage QFontEngine::alphaMapForGlyph(glyph_t glyph)
 
     for (int y=0; y<im.height(); ++y) {
         uchar *dst = (uchar *) alphaMap.scanLine(y);
-        uint *src = (uint *) im.scanLine(y);
+        const uint *src = reinterpret_cast<const uint *>(im.constScanLine(y));
         for (int x=0; x<im.width(); ++x)
             dst[x] = qAlpha(src[x]);
     }
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index 81657a2702..3b330a0fd3 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -1261,7 +1261,7 @@ QFixed QFontEngineFT::xHeight() const
     TT_OS2 *os2 = (TT_OS2 *)FT_Get_Sfnt_Table(freetype->face, ft_sfnt_os2);
     if (os2 && os2->sxHeight) {
         lockFace();
-        QFixed answer = QFixed(os2->sxHeight*freetype->face->size->metrics.y_ppem)/freetype->face->units_per_EM;
+        QFixed answer = QFixed(os2->sxHeight * freetype->face->size->metrics.y_ppem) / emSquareSize();
         unlockFace();
         return answer;
     }
@@ -1273,7 +1273,7 @@ QFixed QFontEngineFT::averageCharWidth() const
     TT_OS2 *os2 = (TT_OS2 *)FT_Get_Sfnt_Table(freetype->face, ft_sfnt_os2);
     if (os2 && os2->xAvgCharWidth) {
         lockFace();
-        QFixed answer = QFixed(os2->xAvgCharWidth*freetype->face->size->metrics.x_ppem)/freetype->face->units_per_EM;
+        QFixed answer = QFixed(os2->xAvgCharWidth * freetype->face->size->metrics.x_ppem) / emSquareSize();
         unlockFace();
         return answer;
     }
@@ -1301,7 +1301,7 @@ void QFontEngineFT::doKerning(QGlyphLayout *g, QFontEngine::ShaperFlags flags) c
         kerning_pairs_loaded = true;
         lockFace();
         if (freetype->face->size->metrics.x_ppem != 0) {
-            QFixed scalingFactor(freetype->face->units_per_EM/freetype->face->size->metrics.x_ppem);
+            QFixed scalingFactor = emSquareSize() / QFixed(freetype->face->size->metrics.x_ppem);
             unlockFace();
             const_cast<QFontEngineFT *>(this)->loadKerningPairs(scalingFactor);
         } else {
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index 3bc8288b73..2189923b25 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -795,7 +795,7 @@ QRect QFontMetrics::boundingRect(const QRect &rect, int flags, const QString &te
     \li Qt::TextSingleLine ignores newline characters.
     \li Qt::TextExpandTabs expands tabs (see below)
     \li Qt::TextShowMnemonic interprets "&x" as \underline{x}; i.e., underlined.
-    \li Qt::TextWordBreak breaks the text to fit the rectangle.
+    \li Qt::TextWordWrap breaks the text to fit the rectangle.
     \endlist
 
     If Qt::TextExpandTabs is set in \a flags, then: if \a tabArray is
@@ -1579,7 +1579,7 @@ QRectF QFontMetricsF::boundingRect(const QRectF &rect, int flags, const QString&
     \li Qt::TextSingleLine ignores newline characters.
     \li Qt::TextExpandTabs expands tabs (see below)
     \li Qt::TextShowMnemonic interprets "&x" as \underline{x}; i.e., underlined.
-    \li Qt::TextWordBreak breaks the text to fit the rectangle.
+    \li Qt::TextWordWrap breaks the text to fit the rectangle.
     \endlist
 
     These flags are defined in the \l{Qt::TextFlag} enum.
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index 85484b8b03..f824d1b369 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -1078,8 +1078,8 @@ QTextCursor::QTextCursor(const QTextBlock &block)
 /*!
   \internal
  */
-QTextCursor::QTextCursor(QTextDocumentPrivate &p, int pos)
-    : d(new QTextCursorPrivate(&p))
+QTextCursor::QTextCursor(QTextDocumentPrivate *p, int pos)
+    : d(new QTextCursorPrivate(p))
 {
     d->adjusted_anchor = d->anchor = d->position = pos;
 
diff --git a/src/gui/text/qtextcursor.h b/src/gui/text/qtextcursor.h
index b8fa3145eb..9610e61b39 100644
--- a/src/gui/text/qtextcursor.h
+++ b/src/gui/text/qtextcursor.h
@@ -67,6 +67,8 @@ class Q_GUI_EXPORT QTextCursor
 public:
     QTextCursor();
     explicit QTextCursor(QTextDocument *document);
+    QTextCursor(QTextDocumentPrivate *p, int pos);
+    explicit QTextCursor(QTextCursorPrivate *d);
     explicit QTextCursor(QTextFrame *frame);
     explicit QTextCursor(const QTextBlock &block);
     QTextCursor(const QTextCursor &cursor);
@@ -225,9 +227,6 @@ public:
     QTextDocument *document() const;
 
 private:
-    QTextCursor(QTextDocumentPrivate &p, int pos);
-    explicit QTextCursor(QTextCursorPrivate *d);
-
     QSharedDataPointer<QTextCursorPrivate> d;
     friend class QTextCursorPrivate;
     friend class QTextDocumentPrivate;
diff --git a/src/gui/text/qtextcursor_p.h b/src/gui/text/qtextcursor_p.h
index 5b593b8a9b..84f912a3fa 100644
--- a/src/gui/text/qtextcursor_p.h
+++ b/src/gui/text/qtextcursor_p.h
@@ -107,7 +107,7 @@ public:
     void aboutToRemoveCell(int from, int to);
 
     static QTextCursor fromPosition(QTextDocumentPrivate *d, int pos)
-    { return QTextCursor(*d, pos); }
+    { return QTextCursor(d, pos); }
 
     QTextDocumentPrivate *priv;
     qreal x;
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index 5cb9e1bb74..348fa83756 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -1710,7 +1710,7 @@ bool QTextDocumentPrivate::ensureMaximumBlockCount()
     beginEditBlock();
 
     const int blocksToRemove = blocks.numNodes() - maximumBlockCount;
-    QTextCursor cursor(*this, 0);
+    QTextCursor cursor(this, 0);
     cursor.movePosition(QTextCursor::NextBlock, QTextCursor::KeepAnchor, blocksToRemove);
 
     unreachableCharacterCount += cursor.selectionEnd() - cursor.selectionStart();
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 1cb42e822b..9cc9cc9206 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -1064,12 +1064,15 @@ QList<QGlyphRun> QTextLayout::glyphRuns(int from, int length) const
 
                     QVector<quint32> indexes = oldGlyphRun.glyphIndexes();
                     QVector<QPointF> positions = oldGlyphRun.positions();
+                    QRectF boundingRect = oldGlyphRun.boundingRect();
 
                     indexes += glyphRun.glyphIndexes();
                     positions += glyphRun.positions();
+                    boundingRect = boundingRect.united(glyphRun.boundingRect());
 
                     oldGlyphRun.setGlyphIndexes(indexes);
                     oldGlyphRun.setPositions(positions);
+                    oldGlyphRun.setBoundingRect(boundingRect);
                 } else {
                     glyphRunHash[key] = glyphRun;
                 }