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

Conflicts:
	src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
	src/dbus/qdbusconnection_p.h
	src/dbus/qdbusintegrator.cpp
	src/dbus/qdbusintegrator_p.h
	tests/auto/corelib/io/qdir/qdir.pro
	tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp

Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc

8 files changed, 70 insertions, 62 deletions

diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h
index 9c1cf20827..1886fc67ba 100644
--- a/src/gui/text/qfontengine_ft_p.h
+++ b/src/gui/text/qfontengine_ft_p.h
@@ -195,65 +195,65 @@ private:
         mutable int fast_glyph_count;
     };
 
-    virtual QFontEngine::FaceId faceId() const Q_DECL_OVERRIDE;
-    virtual QFontEngine::Properties properties() const Q_DECL_OVERRIDE;
-    virtual QFixed emSquareSize() const Q_DECL_OVERRIDE;
-    virtual bool supportsSubPixelPositions() const Q_DECL_OVERRIDE
+    QFontEngine::FaceId faceId() const Q_DECL_OVERRIDE;
+    QFontEngine::Properties properties() const Q_DECL_OVERRIDE;
+    QFixed emSquareSize() const Q_DECL_OVERRIDE;
+    bool supportsSubPixelPositions() const Q_DECL_OVERRIDE
     {
         return default_hint_style == HintLight ||
                default_hint_style == HintNone;
     }
 
-    virtual bool getSfntTableData(uint tag, uchar *buffer, uint *length) const Q_DECL_OVERRIDE;
-    virtual int synthesized() const Q_DECL_OVERRIDE;
+    bool getSfntTableData(uint tag, uchar *buffer, uint *length) const Q_DECL_OVERRIDE;
+    int synthesized() const Q_DECL_OVERRIDE;
 
-    virtual QFixed ascent() const Q_DECL_OVERRIDE;
-    virtual QFixed descent() const Q_DECL_OVERRIDE;
-    virtual QFixed leading() const Q_DECL_OVERRIDE;
-    virtual QFixed xHeight() const Q_DECL_OVERRIDE;
-    virtual QFixed averageCharWidth() const Q_DECL_OVERRIDE;
+    QFixed ascent() const Q_DECL_OVERRIDE;
+    QFixed descent() const Q_DECL_OVERRIDE;
+    QFixed leading() const Q_DECL_OVERRIDE;
+    QFixed xHeight() const Q_DECL_OVERRIDE;
+    QFixed averageCharWidth() const Q_DECL_OVERRIDE;
 
-    virtual qreal maxCharWidth() const Q_DECL_OVERRIDE;
-    virtual QFixed lineThickness() const Q_DECL_OVERRIDE;
-    virtual QFixed underlinePosition() const Q_DECL_OVERRIDE;
+    qreal maxCharWidth() const Q_DECL_OVERRIDE;
+    QFixed lineThickness() const Q_DECL_OVERRIDE;
+    QFixed underlinePosition() const Q_DECL_OVERRIDE;
 
-    virtual glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE;
+    glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE;
     void doKerning(QGlyphLayout *, ShaperFlags) const Q_DECL_OVERRIDE;
 
-    virtual void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) Q_DECL_OVERRIDE;
+    void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) Q_DECL_OVERRIDE;
 
-    virtual bool supportsTransformation(const QTransform &transform) const Q_DECL_OVERRIDE;
+    bool supportsTransformation(const QTransform &transform) const Q_DECL_OVERRIDE;
 
-    virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
-                         QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE;
-    virtual void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs,
-                          QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE;
+    void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
+                 QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE;
+    void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs,
+                  QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE;
 
-    virtual bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE;
+    bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE;
 
-    virtual glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE;
-    virtual glyph_metrics_t boundingBox(glyph_t glyph) Q_DECL_OVERRIDE;
-    virtual glyph_metrics_t boundingBox(glyph_t glyph, const QTransform &matrix) Q_DECL_OVERRIDE;
+    glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE;
+    glyph_metrics_t boundingBox(glyph_t glyph) Q_DECL_OVERRIDE;
+    glyph_metrics_t boundingBox(glyph_t glyph, const QTransform &matrix) Q_DECL_OVERRIDE;
 
-    virtual void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags flags) const Q_DECL_OVERRIDE;
-    virtual QImage alphaMapForGlyph(glyph_t g) Q_DECL_OVERRIDE { return alphaMapForGlyph(g, 0); }
-    virtual QImage alphaMapForGlyph(glyph_t, QFixed) Q_DECL_OVERRIDE;
+    void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags flags) const Q_DECL_OVERRIDE;
+    QImage alphaMapForGlyph(glyph_t g) Q_DECL_OVERRIDE { return alphaMapForGlyph(g, 0); }
+    QImage alphaMapForGlyph(glyph_t, QFixed) Q_DECL_OVERRIDE;
     QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
-    virtual QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
-    virtual glyph_metrics_t alphaMapBoundingBox(glyph_t glyph,
-                                                QFixed subPixelPosition,
-                                                const QTransform &matrix,
-                                                QFontEngine::GlyphFormat format) Q_DECL_OVERRIDE;
-    virtual QImage *lockedAlphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition,
-                                           GlyphFormat neededFormat, const QTransform &t,
-                                           QPoint *offset) Q_DECL_OVERRIDE;
-    virtual bool hasInternalCaching() const Q_DECL_OVERRIDE { return cacheEnabled; }
-    virtual void unlockAlphaMapForGlyph() Q_DECL_OVERRIDE;
-
-    virtual void removeGlyphFromCache(glyph_t glyph) Q_DECL_OVERRIDE;
-    virtual int glyphMargin(QFontEngine::GlyphFormat /* format */) Q_DECL_OVERRIDE { return 0; }
-
-    virtual int glyphCount() const Q_DECL_OVERRIDE;
+    QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
+    glyph_metrics_t alphaMapBoundingBox(glyph_t glyph,
+                                        QFixed subPixelPosition,
+                                        const QTransform &matrix,
+                                        QFontEngine::GlyphFormat format) Q_DECL_OVERRIDE;
+    QImage *lockedAlphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition,
+                                   GlyphFormat neededFormat, const QTransform &t,
+                                   QPoint *offset) Q_DECL_OVERRIDE;
+    bool hasInternalCaching() const Q_DECL_OVERRIDE { return cacheEnabled; }
+    void unlockAlphaMapForGlyph() Q_DECL_OVERRIDE;
+
+    void removeGlyphFromCache(glyph_t glyph) Q_DECL_OVERRIDE;
+    int glyphMargin(QFontEngine::GlyphFormat /* format */) Q_DECL_OVERRIDE { return 0; }
+
+    int glyphCount() const Q_DECL_OVERRIDE;
 
     enum Scaling {
         Scaled,
@@ -283,12 +283,12 @@ private:
     bool init(FaceId faceId, bool antialias, GlyphFormat format,
               QFreetypeFace *freetypeFace);
 
-    virtual int getPointInOutline(glyph_t glyph, int flags, quint32 point, QFixed *xpos, QFixed *ypos, quint32 *nPoints) Q_DECL_OVERRIDE;
+    int getPointInOutline(glyph_t glyph, int flags, quint32 point, QFixed *xpos, QFixed *ypos, quint32 *nPoints) Q_DECL_OVERRIDE;
 
     void setQtDefaultHintStyle(QFont::HintingPreference hintingPreference);
-    virtual void setDefaultHintStyle(HintStyle style) Q_DECL_OVERRIDE;
+    void setDefaultHintStyle(HintStyle style) Q_DECL_OVERRIDE;
 
-    virtual QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE;
+    QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE;
     bool initFromFontEngine(const QFontEngineFT *fontEngine);
 
     HintStyle defaultHintStyle() const { return default_hint_style; }
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index f824d1b369..85484b8b03 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 bc099e9d03..b8fa3145eb 100644
--- a/src/gui/text/qtextcursor.h
+++ b/src/gui/text/qtextcursor.h
@@ -67,10 +67,8 @@ class Q_GUI_EXPORT QTextCursor
 public:
     QTextCursor();
     explicit QTextCursor(QTextDocument *document);
-    QTextCursor(QTextDocumentPrivate *p, int pos);
     explicit QTextCursor(QTextFrame *frame);
     explicit QTextCursor(const QTextBlock &block);
-    explicit QTextCursor(QTextCursorPrivate *d);
     QTextCursor(const QTextCursor &cursor);
 #ifdef Q_COMPILER_RVALUE_REFS
     QTextCursor &operator=(QTextCursor &&other) Q_DECL_NOTHROW { swap(other); return *this; }
@@ -227,8 +225,12 @@ public:
     QTextDocument *document() const;
 
 private:
+    QTextCursor(QTextDocumentPrivate &p, int pos);
+    explicit QTextCursor(QTextCursorPrivate *d);
+
     QSharedDataPointer<QTextCursorPrivate> d;
     friend class QTextCursorPrivate;
+    friend class QTextDocumentPrivate;
     friend class QTextDocumentFragmentPrivate;
     friend class QTextCopyHelper;
     friend class QWidgetTextControlPrivate;
diff --git a/src/gui/text/qtextcursor_p.h b/src/gui/text/qtextcursor_p.h
index 9463a8be6f..5b593b8a9b 100644
--- a/src/gui/text/qtextcursor_p.h
+++ b/src/gui/text/qtextcursor_p.h
@@ -106,6 +106,9 @@ public:
 
     void aboutToRemoveCell(int from, int to);
 
+    static QTextCursor fromPosition(QTextDocumentPrivate *d, int pos)
+    { return QTextCursor(*d, pos); }
+
     QTextDocumentPrivate *priv;
     qreal x;
     int position;
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 01d6d2c519..f50f771c07 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -39,6 +39,7 @@
 
 #include "qtextdocument.h"
 #include <qtextformat.h>
+#include "qtextcursor_p.h"
 #include "qtextdocumentlayout_p.h"
 #include "qtextdocumentfragment.h"
 #include "qtextdocumentfragment_p.h"
@@ -1279,7 +1280,7 @@ static bool findInBlock(const QTextBlock &block, const QString &expression, int
             }
         }
         //we have a hit, return the cursor for that.
-        *cursor = QTextCursor(block.docHandle(), block.position() + idx);
+        *cursor = QTextCursorPrivate::fromPosition(block.docHandle(), block.position() + idx);
         cursor->setPosition(cursor->position() + expression.length(), QTextCursor::KeepAnchor);
         return true;
     }
@@ -1397,7 +1398,7 @@ static bool findInBlock(const QTextBlock &block, const QRegExp &expression, int
             }
         }
         //we have a hit, return the cursor for that.
-        *cursor = QTextCursor(block.docHandle(), block.position() + idx);
+        *cursor = QTextCursorPrivate::fromPosition(block.docHandle(), block.position() + idx);
         cursor->setPosition(cursor->position() + expr.matchedLength(), QTextCursor::KeepAnchor);
         return true;
     }
@@ -1525,7 +1526,7 @@ static bool findInBlock(const QTextBlock &block, const QRegularExpression &expre
             }
         }
         //we have a hit, return the cursor for that.
-        *cursor = QTextCursor(block.docHandle(), block.position() + idx);
+        *cursor = QTextCursorPrivate::fromPosition(block.docHandle(), block.position() + idx);
         cursor->setPosition(cursor->position() + match.capturedLength(), QTextCursor::KeepAnchor);
         return true;
     }
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index ed421177fe..cfca718f01 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/qtextobject.cpp b/src/gui/text/qtextobject.cpp
index 6aefe8b339..49cf35ecc0 100644
--- a/src/gui/text/qtextobject.cpp
+++ b/src/gui/text/qtextobject.cpp
@@ -39,6 +39,7 @@
 
 #include "qtextobject.h"
 #include "qtextobject_p.h"
+#include "qtextcursor_p.h"
 #include "qtextdocument.h"
 #include "qtextformat_p.h"
 #include "qtextdocument_p.h"
@@ -467,7 +468,7 @@ QTextFrame *QTextFrame::parentFrame() const
 QTextCursor QTextFrame::firstCursorPosition() const
 {
     Q_D(const QTextFrame);
-    return QTextCursor(d->pieceTable, firstPosition());
+    return QTextCursorPrivate::fromPosition(d->pieceTable, firstPosition());
 }
 
 /*!
@@ -478,7 +479,7 @@ QTextCursor QTextFrame::firstCursorPosition() const
 QTextCursor QTextFrame::lastCursorPosition() const
 {
     Q_D(const QTextFrame);
-    return QTextCursor(d->pieceTable, lastPosition());
+    return QTextCursorPrivate::fromPosition(d->pieceTable, lastPosition());
 }
 
 /*!
diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp
index 20821c66ef..062a214d63 100644
--- a/src/gui/text/qtexttable.cpp
+++ b/src/gui/text/qtexttable.cpp
@@ -41,6 +41,7 @@
 #include "qtextcursor.h"
 #include "qtextformat.h"
 #include <qdebug.h>
+#include "qtextcursor_p.h"
 #include "qtexttable_p.h"
 #include "qvarlengtharray.h"
 
@@ -226,7 +227,7 @@ int QTextTableCell::columnSpan() const
 */
 QTextCursor QTextTableCell::firstCursorPosition() const
 {
-    return QTextCursor(table->d_func()->pieceTable, firstPosition());
+    return QTextCursorPrivate::fromPosition(table->d_func()->pieceTable, firstPosition());
 }
 
 /*!
@@ -236,7 +237,7 @@ QTextCursor QTextTableCell::firstCursorPosition() const
 */
 QTextCursor QTextTableCell::lastCursorPosition() const
 {
-    return QTextCursor(table->d_func()->pieceTable, lastPosition());
+    return QTextCursorPrivate::fromPosition(table->d_func()->pieceTable, lastPosition());
 }
 
 
@@ -1109,10 +1110,10 @@ void QTextTable::mergeCells(int row, int column, int numRows, int numCols)
             if (nextPos > pos) {
                 if (needsParagraph) {
                     needsParagraph = false;
-                    QTextCursor(p, insertPos++).insertBlock();
+                    QTextCursorPrivate::fromPosition(p, insertPos++).insertBlock();
                     p->move(pos + 1, insertPos, nextPos - pos);
                 } else if (rowHasText) {
-                    QTextCursor(p, insertPos++).insertText(QLatin1String(" "));
+                    QTextCursorPrivate::fromPosition(p, insertPos++).insertText(QLatin1String(" "));
                     p->move(pos + 1, insertPos, nextPos - pos);
                 } else {
                     p->move(pos, insertPos, nextPos - pos);
@@ -1288,7 +1289,7 @@ QTextCursor QTextTable::rowStart(const QTextCursor &c) const
     int row = cell.row();
     QTextDocumentPrivate *p = d->pieceTable;
     QTextDocumentPrivate::FragmentIterator it(&p->fragmentMap(), d->grid[row*d->nCols]);
-    return QTextCursor(p, it.position());
+    return QTextCursorPrivate::fromPosition(p, it.position());
 }
 
 /*!
@@ -1310,7 +1311,7 @@ QTextCursor QTextTable::rowEnd(const QTextCursor &c) const
     int fragment = row < d->nRows ? d->grid[row*d->nCols] : d->fragment_end;
     QTextDocumentPrivate *p = d->pieceTable;
     QTextDocumentPrivate::FragmentIterator it(&p->fragmentMap(), fragment);
-    return QTextCursor(p, it.position() - 1);
+    return QTextCursorPrivate::fromPosition(p, it.position() - 1);
 }
 
 /*!