Merge remote branch 'staging/master' into refactor

Conflicts:
	src/gui/painting/qdrawhelper_p.h
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/painting/qpainter.cpp
	src/gui/painting/qunifiedtoolbarsurface_mac.cpp
	src/gui/painting/qunifiedtoolbarsurface_mac_p.h
	src/openvg/openvg.pro
	src/openvg/qpaintengine_vg.cpp
	src/openvg/qwindowsurface_vg.cpp
	src/openvg/qwindowsurface_vgegl.cpp
	src/plugins/platforms/wayland/qwaylanddisplay.cpp
	src/widgets/graphicsview/qgraphicsscene.cpp

1 files changed, 0 insertions, 35 deletions

diff --git a/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp b/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
index cf40f9a05a..5919c01085 100644
--- a/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
+++ b/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp
@@ -86,38 +86,3 @@ beginMoveRows(parent, 2, 2, parent, 0);
 //! [9]
 beginMoveRows(parent, 2, 2, parent, 4);
 //! [9]
-
-
-//! [10]
-class CustomDataProxy : public QSortFilterProxyModel
-{
-    Q_OBJECT
-public:
-    CustomDataProxy(QObject *parent)
-      : QSortFilterProxyModel(parent)
-    {
-    }
-
-    ...
-
-    QVariant data(const QModelIndex &index, int role)
-    {
-        if (role != Qt::BackgroundRole)
-            return QSortFilterProxyModel::data(index, role);
-
-        if (m_customData.contains(index.row()))
-            return m_customData.value(index.row());
-        return QSortFilterProxyModel::data(index, role);
-    }
-
-private slots:
-    void resetInternalData()
-    {
-        m_customData.clear();
-    }
-
-private:
-  QHash<int, QVariant> m_customData;
-};
-//! [10]
-