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

Change-Id: I4505ec6fe17a1aa2c8d1e6576234d06a34eb9f99

4 files changed, 8 insertions, 7 deletions

diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h
index 79593a3e1c..639c01571a 100644
--- a/src/corelib/io/qfsfileengine_p.h
+++ b/src/corelib/io/qfsfileengine_p.h
@@ -66,7 +66,7 @@ struct ProcessOpenModeResult {
     QIODevice::OpenMode openMode;
     QString error;
 };
-inline Q_CORE_EXPORT ProcessOpenModeResult processOpenModeFlags(QIODevice::OpenMode mode);
+Q_CORE_EXPORT ProcessOpenModeResult processOpenModeFlags(QIODevice::OpenMode mode);
 
 class QFSFileEnginePrivate;
 
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index 8801e66b0f..b1d1f30800 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -661,6 +661,7 @@ void QPainterPath::clear()
 
     detach();
     d_func()->clear();
+    d_func()->elements.append( {0, 0, MoveToElement} );
 }
 
 /*!
@@ -2337,12 +2338,12 @@ bool QPainterPath::operator==(const QPainterPath &path) const
 {
     QPainterPathData *d = reinterpret_cast<QPainterPathData *>(d_func());
     QPainterPathData *other_d = path.d_func();
-    if (other_d == d)
+    if (other_d == d) {
         return true;
-    else if (!d || !other_d) {
-        if (!d && other_d->elements.empty() && other_d->fillRule == Qt::OddEvenFill)
+    } else if (!d || !other_d) {
+        if (!other_d && isEmpty() && elementAt(0) == QPointF() && d->fillRule == Qt::OddEvenFill)
             return true;
-        if (!other_d && d && d->elements.empty() && d->fillRule == Qt::OddEvenFill)
+        if (!d && path.isEmpty() && path.elementAt(0) == QPointF() && other_d->fillRule == Qt::OddEvenFill)
             return true;
         return false;
     }
diff --git a/src/gui/painting/qpainterpath_p.h b/src/gui/painting/qpainterpath_p.h
index 22bdbde2a9..a420e0b3d9 100644
--- a/src/gui/painting/qpainterpath_p.h
+++ b/src/gui/painting/qpainterpath_p.h
@@ -313,7 +313,7 @@ inline void QPainterPathData::clear()
     elements.clear();
 
     cStart = 0;
-
+    fillRule = Qt::OddEvenFill;
     bounds = {};
     controlBounds = {};
 
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index c985b945f8..d4c83cb82c 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -344,7 +344,7 @@ void QAbstractItemViewPrivate::_q_scrollerStateChanged()
 
     \value SingleSelection  When the user selects an item, any already-selected
     item becomes unselected. It is possible for the user to deselect the selected
-    item.
+    item by pressing the Ctrl key when clicking the selected item.
 
     \value ContiguousSelection When the user selects an item in the usual way,
     the selection is cleared and the new item selected. However, if the user