3 files changed, 8 insertions, 2 deletions
diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
index a9a57c57fa..fe3475e6bb 100644
--- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
@@ -183,7 +183,9 @@ QT_BEGIN_NAMESPACE
 
     \warning This class is provided for convenience when bridging
     QWidgets and QGraphicsItems, it should not be used for
-    high-performance scenarios.
+    high-performance scenarios. In particular, embedding widgets into a scene
+    that is then displayed through a QGraphicsView that uses an OpenGL viewport
+    will not work for all combinations.
 
     \sa QGraphicsScene::addWidget(), QGraphicsWidget
 */
diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp
index 686b41960a..7ac9aebfe6 100644
--- a/src/widgets/graphicsview/qgraphicsview.cpp
+++ b/src/widgets/graphicsview/qgraphicsview.cpp
@@ -123,6 +123,10 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime <
 
     \image graphicsview-view.png
 
+    \note Using an OpenGL viewport limits the ability to use QGraphicsProxyWidget.
+    Not all combinations of widgets and styles can be supported with such a setup.
+    You should carefully test your UI and make the necessary adjustments.
+
     \sa QGraphicsScene, QGraphicsItem, QGraphicsSceneEvent
 */
 
diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp
index 60abd02564..7b1f1a1caf 100644
--- a/src/widgets/itemviews/qtablewidget.cpp
+++ b/src/widgets/itemviews/qtablewidget.cpp
@@ -247,8 +247,8 @@ void QTableModel::removeItem(QTableWidgetItem *item)
 {
     int i = tableItems.indexOf(item);
     if (i != -1) {
-        tableItems[i] = 0;
         QModelIndex idx = index(item);
+        tableItems[i] = nullptr;
         emit dataChanged(idx, idx);
         return;
     }