1 files changed, 82 insertions, 74 deletions

diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index a47d0d879d..1c6e68def1 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -278,7 +278,7 @@ static void _q_hoverFromMouseEvent(QGraphicsSceneHoverEvent *hover, const QGraph
 */
 QGraphicsScenePrivate::QGraphicsScenePrivate()
     : indexMethod(QGraphicsScene::BspTreeIndex),
-      index(0),
+      index(nullptr),
       lastItemCount(0),
       hasSceneRect(false),
       dirtyGrowingItemsBoundingRect(true),
@@ -301,19 +301,19 @@ QGraphicsScenePrivate::QGraphicsScenePrivate()
       minimumRenderSize(0.0),
       selectionChanging(0),
       rectAdjust(2),
-      focusItem(0),
-      lastFocusItem(0),
-      passiveFocusItem(0),
-      tabFocusFirst(0),
-      activePanel(0),
-      lastActivePanel(0),
+      focusItem(nullptr),
+      lastFocusItem(nullptr),
+      passiveFocusItem(nullptr),
+      tabFocusFirst(nullptr),
+      activePanel(nullptr),
+      lastActivePanel(nullptr),
       activationRefCount(0),
       childExplicitActivation(0),
-      lastMouseGrabberItem(0),
-      dragDropItem(0),
-      enterWidget(0),
+      lastMouseGrabberItem(nullptr),
+      dragDropItem(nullptr),
+      enterWidget(nullptr),
       lastDropAction(Qt::IgnoreAction),
-      style(0)
+      style(nullptr)
 {
 }
 
@@ -443,8 +443,8 @@ void QGraphicsScenePrivate::_q_polishItems()
         return;
 
     const QVariant booleanTrueVariant(true);
-    QGraphicsItem *item = 0;
-    QGraphicsItemPrivate *itemd = 0;
+    QGraphicsItem *item = nullptr;
+    QGraphicsItemPrivate *itemd = nullptr;
     const int oldUnpolishedCount = unpolishedItems.count();
 
     for (int i = 0; i < oldUnpolishedCount; ++i) {
@@ -602,7 +602,7 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
         unregisterScenePosItem(item);
 
     QGraphicsScene *oldScene = item->d_func()->scene;
-    item->d_func()->scene = 0;
+    item->d_func()->scene = nullptr;
 
     //We need to remove all children first because they might use their parent
     //attributes (e.g. sceneTransform).
@@ -614,7 +614,7 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
 
     if (!item->d_ptr->inDestructor && !item->parentItem() && item->isWidget()) {
         QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(item);
-        widget->d_func()->fixFocusChainBeforeReparenting(0, oldScene, 0);
+        widget->d_func()->fixFocusChainBeforeReparenting(nullptr, oldScene, nullptr);
     }
 
     // Unregister focus proxy.
@@ -625,7 +625,7 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
         if (parentItem->scene()) {
             Q_ASSERT_X(parentItem->scene() == q, "QGraphicsScene::removeItem",
                        "Parent item's scene is different from this item's scene");
-            item->setParentItem(0);
+            item->setParentItem(nullptr);
         }
     } else {
         unregisterTopLevelItem(item);
@@ -633,17 +633,17 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
 
     // Reset the mouse grabber and focus item data.
     if (item == focusItem)
-        focusItem = 0;
+        focusItem = nullptr;
     if (item == lastFocusItem)
-        lastFocusItem = 0;
+        lastFocusItem = nullptr;
     if (item == passiveFocusItem)
-        passiveFocusItem = 0;
+        passiveFocusItem = nullptr;
     if (item == activePanel) {
         // ### deactivate...
-        activePanel = 0;
+        activePanel = nullptr;
     }
     if (item == lastActivePanel)
-        lastActivePanel = 0;
+        lastActivePanel = nullptr;
 
     // Change tabFocusFirst to the next widget in focus chain if removing the current one.
     if (item == tabFocusFirst) {
@@ -651,7 +651,7 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
         if (wd->focusNext && wd->focusNext != tabFocusFirst && wd->focusNext->scene() == q)
             tabFocusFirst = wd->focusNext;
         else
-            tabFocusFirst = 0;
+            tabFocusFirst = nullptr;
     }
 
     // Cancel active touches
@@ -705,11 +705,11 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
 
     // Reset the last mouse grabber item
     if (item == lastMouseGrabberItem)
-        lastMouseGrabberItem = 0;
+        lastMouseGrabberItem = nullptr;
 
     // Reset the current drop item
     if (item == dragDropItem)
-        dragDropItem = 0;
+        dragDropItem = nullptr;
 
     // Reenable selectionChanged() for individual items
     --selectionChanging;
@@ -752,8 +752,8 @@ void QGraphicsScenePrivate::setActivePanelHelper(QGraphicsItem *item, bool durin
     q->setFocus(Qt::ActiveWindowFocusReason);
 
     // Find the item's panel.
-    QGraphicsItem *panel = item ? item->panel() : 0;
-    lastActivePanel = panel ? activePanel : 0;
+    QGraphicsItem *panel = item ? item->panel() : nullptr;
+    lastActivePanel = panel ? activePanel : nullptr;
     if (panel == activePanel || (!q->isActive() && !duringActivationEvent))
         return;
 
@@ -764,7 +764,7 @@ void QGraphicsScenePrivate::setActivePanelHelper(QGraphicsItem *item, bool durin
         if (QGraphicsItem *fi = activePanel->focusItem()) {
             // Remove focus from the current focus item.
             if (fi == q->focusItem())
-                setFocusItemHelper(0, Qt::ActiveWindowFocusReason, /* emitFocusChanged = */ false);
+                setFocusItemHelper(nullptr, Qt::ActiveWindowFocusReason, /* emitFocusChanged = */ false);
         }
 
         QEvent event(QEvent::WindowDeactivate);
@@ -841,7 +841,7 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item,
     // accept input focus.
     if (item && (!(item->flags() & QGraphicsItem::ItemIsFocusable)
                  || !item->isVisible() || !item->isEnabled())) {
-        item = 0;
+        item = nullptr;
     }
 
     // Set focus on the scene if an item requests focus.
@@ -849,7 +849,7 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item,
         q->setFocus(focusReason);
         if (item == focusItem) {
             if (emitFocusChanged)
-                emit q->focusItemChanged(focusItem, (QGraphicsItem *)0, focusReason);
+                emit q->focusItemChanged(focusItem, (QGraphicsItem *)nullptr, focusReason);
             return;
         }
     }
@@ -869,7 +869,7 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item,
         }
 #endif //QT_NO_IM
 
-        focusItem = 0;
+        focusItem = nullptr;
         QFocusEvent event(QEvent::FocusOut, focusReason);
         sendEvent(lastFocusItem, &event);
     }
@@ -877,7 +877,7 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item,
     // This handles the case that the item has been removed from the
     // scene in response to the FocusOut event.
     if (item && item->scene() != q)
-        item = 0;
+        item = nullptr;
 
     if (item)
         focusItem = item;
@@ -1039,7 +1039,7 @@ void QGraphicsScenePrivate::clearMouseGrabber()
 {
     if (!mouseGrabberItems.isEmpty())
         mouseGrabberItems.first()->ungrabMouse();
-    lastMouseGrabberItem = 0;
+    lastMouseGrabberItem = nullptr;
 }
 
 /*!
@@ -1365,10 +1365,10 @@ void QGraphicsScenePrivate::mousePressEventHandler(QGraphicsSceneMouseEvent *mou
 
     // Update window activation.
     QGraphicsItem *topItem = cachedItemsUnderMouse.value(0);
-    QGraphicsWidget *newActiveWindow = topItem ? topItem->window() : 0;
+    QGraphicsWidget *newActiveWindow = topItem ? topItem->window() : nullptr;
     if (newActiveWindow && newActiveWindow->isBlockedByModalPanel(&topItem)) {
         // pass activation to the blocking modal window
-        newActiveWindow = topItem ? topItem->window() : 0;
+        newActiveWindow = topItem ? topItem->window() : nullptr;
     }
 
     if (newActiveWindow != q->activeWindow())
@@ -1409,7 +1409,7 @@ void QGraphicsScenePrivate::mousePressEventHandler(QGraphicsSceneMouseEvent *mou
 
     // If nobody could take focus, clear it.
     if (!stickyFocus && !setFocus && !sceneModality)
-        q->setFocusItem(0, Qt::MouseFocusReason);
+        q->setFocusItem(nullptr, Qt::MouseFocusReason);
 
     // Any item will do.
     if (sceneModality && cachedItemsUnderMouse.isEmpty())
@@ -1694,7 +1694,7 @@ QGraphicsScene::~QGraphicsScene()
 
     // Remove this scene from all associated views.
     for (int j = 0; j < d->views.size(); ++j)
-        d->views.at(j)->setScene(0);
+        d->views.at(j)->setScene(nullptr);
 }
 
 /*!
@@ -2432,7 +2432,7 @@ QGraphicsItemGroup *QGraphicsScene::createItemGroup(const QList<QGraphicsItem *>
     }
 
     // Find the common ancestor for all items
-    QGraphicsItem *commonAncestor = 0;
+    QGraphicsItem *commonAncestor = nullptr;
     if (!ancestors.isEmpty()) {
         while (n < items.size()) {
             int commonIndex = -1;
@@ -2446,7 +2446,7 @@ QGraphicsItemGroup *QGraphicsScene::createItemGroup(const QList<QGraphicsItem *>
             } while ((parent = parent->parentItem()));
 
             if (commonIndex == -1) {
-                commonAncestor = 0;
+                commonAncestor = nullptr;
                 break;
             }
 
@@ -2545,7 +2545,7 @@ void QGraphicsScene::addItem(QGraphicsItem *item)
     // from this scene.
     if (QGraphicsItem *itemParent = item->d_ptr->parent) {
         if (itemParent->d_ptr->scene != this)
-            item->setParentItem(0);
+            item->setParentItem(nullptr);
     }
 
     // Add the item to this scene
@@ -2568,8 +2568,16 @@ void QGraphicsScene::addItem(QGraphicsItem *item)
     ++d->selectionChanging;
     int oldSelectedItemSize = d->selectedItems.size();
 
-    // Enable mouse tracking if the item accepts hover events or has a cursor set.
-    if (d->allItemsIgnoreHoverEvents && d->itemAcceptsHoverEvents_helper(item)) {
+    // Enable mouse tracking if we haven't already done so, and the item needs it.
+    // We cannot use itemAcceptsHoverEvents_helper() here, since we need to enable
+    // mouse tracking also if this item is temporarily blocked by a modal panel.
+
+    auto needsMouseTracking = [](const QGraphicsItemPrivate *item) {
+        return item->acceptsHover
+                || (item->isWidget && static_cast<const QGraphicsWidgetPrivate *>(item)->hasDecoration());
+    };
+
+    if (d->allItemsIgnoreHoverEvents && needsMouseTracking(item->d_ptr.data())) {
         d->allItemsIgnoreHoverEvents = false;
         d->enableMouseTrackingOnViews();
     }
@@ -2903,7 +2911,7 @@ QGraphicsSimpleTextItem *QGraphicsScene::addSimpleText(const QString &text, cons
 */
 QGraphicsProxyWidget *QGraphicsScene::addWidget(QWidget *widget, Qt::WindowFlags wFlags)
 {
-    QGraphicsProxyWidget *proxy = new QGraphicsProxyWidget(0, wFlags);
+    QGraphicsProxyWidget *proxy = new QGraphicsProxyWidget(nullptr, wFlags);
     proxy->setWidget(widget);
     addItem(proxy);
     return proxy;
@@ -2936,7 +2944,7 @@ void QGraphicsScene::removeItem(QGraphicsItem *item)
     const QVariant newSceneVariant(item->itemChange(QGraphicsItem::ItemSceneChange,
                                                     QVariant::fromValue<QGraphicsScene *>(0)));
     QGraphicsScene *targetScene = qvariant_cast<QGraphicsScene *>(newSceneVariant);
-    if (targetScene != 0 && targetScene != this) {
+    if (targetScene != nullptr && targetScene != this) {
         targetScene->addItem(item);
         return;
     }
@@ -3038,7 +3046,7 @@ void QGraphicsScene::clearFocus()
     if (d->hasFocus) {
         d->hasFocus = false;
         d->passiveFocusItem = d->focusItem;
-        setFocusItem(0, Qt::OtherFocusReason);
+        setFocusItem(nullptr, Qt::OtherFocusReason);
     }
 }
 
@@ -3484,7 +3492,7 @@ bool QGraphicsScene::event(QEvent *event)
                 // Deactivate the active panel (but keep it so we can
                 // reactivate it later).
                 QGraphicsItem *lastActivePanel = d->activePanel;
-                d->setActivePanelHelper(0, true);
+                d->setActivePanelHelper(nullptr, true);
                 d->lastActivePanel = lastActivePanel;
             } else {
                 // Activate all toplevel items.
@@ -3613,7 +3621,7 @@ void QGraphicsScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *contextMen
 void QGraphicsScene::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
 {
     Q_D(QGraphicsScene);
-    d->dragDropItem = 0;
+    d->dragDropItem = nullptr;
     d->lastDropAction = Qt::IgnoreAction;
     event->accept();
 }
@@ -3697,7 +3705,7 @@ void QGraphicsScene::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
             QGraphicsSceneDragDropEvent dragLeave(QEvent::GraphicsSceneDragLeave);
             d->cloneDragDropEvent(&dragLeave, event);
             d->sendDragDropEvent(d->dragDropItem, &dragLeave);
-            d->dragDropItem = 0;
+            d->dragDropItem = nullptr;
         }
         // Propagate
         event->setDropAction(Qt::IgnoreAction);
@@ -3717,7 +3725,7 @@ void QGraphicsScene::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
     if (d->dragDropItem) {
         // Leave the last drag drop item
         d->sendDragDropEvent(d->dragDropItem, event);
-        d->dragDropItem = 0;
+        d->dragDropItem = nullptr;
     }
 }
 
@@ -3735,7 +3743,7 @@ void QGraphicsScene::dropEvent(QGraphicsSceneDragDropEvent *event)
     if (d->dragDropItem) {
         // Drop on the last drag drop item
         d->sendDragDropEvent(d->dragDropItem, event);
-        d->dragDropItem = 0;
+        d->dragDropItem = nullptr;
     }
 }
 
@@ -3785,7 +3793,7 @@ void QGraphicsScene::focusOutEvent(QFocusEvent *focusEvent)
     Q_D(QGraphicsScene);
     d->hasFocus = false;
     d->passiveFocusItem = d->focusItem;
-    setFocusItem(0, focusEvent->reason());
+    setFocusItem(nullptr, focusEvent->reason());
 
     // Remove all popups when the scene loses focus.
     if (!d->popupWidgets.isEmpty())
@@ -3817,7 +3825,7 @@ void QGraphicsScene::helpEvent(QGraphicsSceneHelpEvent *helpEvent)
     QList<QGraphicsItem *> itemsAtPos = d->itemsAtPosition(helpEvent->screenPos(),
                                                            helpEvent->scenePos(),
                                                            helpEvent->widget());
-    QGraphicsItem *toolTipItem = 0;
+    QGraphicsItem *toolTipItem = nullptr;
     for (int i = 0; i < itemsAtPos.size(); ++i) {
         QGraphicsItem *tmp = itemsAtPos.at(i);
         if (tmp->d_func()->isProxyWidget()) {
@@ -3875,7 +3883,7 @@ bool QGraphicsScenePrivate::dispatchHoverEvent(QGraphicsSceneHoverEvent *hoverEv
                                                 hoverEvent->widget());
     }
 
-    QGraphicsItem *item = 0;
+    QGraphicsItem *item = nullptr;
     for (int i = 0; i < cachedItemsUnderMouse.size(); ++i) {
         QGraphicsItem *tmp = cachedItemsUnderMouse.at(i);
         if (itemAcceptsHoverEvents_helper(tmp)) {
@@ -3886,13 +3894,13 @@ bool QGraphicsScenePrivate::dispatchHoverEvent(QGraphicsSceneHoverEvent *hoverEv
 
     // Find the common ancestor item for the new topmost hoverItem and the
     // last item in the hoverItem list.
-    QGraphicsItem *commonAncestorItem = (item && !hoverItems.isEmpty()) ? item->commonAncestorItem(hoverItems.constLast()) : 0;
+    QGraphicsItem *commonAncestorItem = (item && !hoverItems.isEmpty()) ? item->commonAncestorItem(hoverItems.constLast()) : nullptr;
     while (commonAncestorItem && !itemAcceptsHoverEvents_helper(commonAncestorItem))
         commonAncestorItem = commonAncestorItem->parentItem();
     if (commonAncestorItem && commonAncestorItem->panel() != item->panel()) {
         // The common ancestor isn't in the same panel as the two hovered
         // items.
-        commonAncestorItem = 0;
+        commonAncestorItem = nullptr;
     }
 
     // Check if the common ancestor item is known.
@@ -4122,7 +4130,7 @@ void QGraphicsScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent)
             if (d->lastMouseGrabberItemHasImplicitMouseGrab)
                 d->mouseGrabberItems.constLast()->ungrabMouse();
         } else {
-            d->lastMouseGrabberItem = 0;
+            d->lastMouseGrabberItem = nullptr;
         }
 
         // Generate a hoverevent
@@ -4354,7 +4362,7 @@ static void _q_paintIntoCache(QPixmap *pix, QGraphicsItem *item, const QRegion &
     pixmapPainter.setWorldTransform(itemToPixmap, true);
 
     // Render.
-    _q_paintItem(item, &pixmapPainter, option, 0, false, painterStateProtection);
+    _q_paintItem(item, &pixmapPainter, option, nullptr, false, painterStateProtection);
     pixmapPainter.end();
 
     if (!subPix.isNull()) {
@@ -4748,7 +4756,7 @@ void QGraphicsScenePrivate::drawSubtreeRecursive(QGraphicsItem *item, QPainter *
         return;
 
     QTransform transform(Qt::Uninitialized);
-    QTransform *transformPtr = 0;
+    QTransform *transformPtr = nullptr;
     bool translateOnlyTransform = false;
 #define ENSURE_TRANSFORM_PTR \
     if (!transformPtr) { \
@@ -4858,7 +4866,7 @@ void QGraphicsScenePrivate::drawSubtreeRecursive(QGraphicsItem *item, QPainter *
 
         item->d_ptr->graphicsEffect->draw(painter);
         painter->setWorldTransform(restoreTransform);
-        sourced->info = 0;
+        sourced->info = nullptr;
     } else
 #endif // QT_CONFIG(graphicseffect)
     {
@@ -4936,7 +4944,7 @@ void QGraphicsScenePrivate::draw(QGraphicsItem *item, QPainter *painter, const Q
         Q_ASSERT(!(item->d_ptr->flags & QGraphicsItem::ItemHasNoContents));
         Q_ASSERT(transformPtr);
         item->d_ptr->initStyleOption(&styleOptionTmp, *transformPtr, exposedRegion
-                                     ? *exposedRegion : QRegion(), exposedRegion == 0);
+                                     ? *exposedRegion : QRegion(), exposedRegion == nullptr);
 
         const bool itemClipsToShape = item->d_ptr->flags & QGraphicsItem::ItemClipsToShape;
         bool restorePainterClip = false;
@@ -5322,7 +5330,7 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
         if (itemClipsChildrenToShape) {
             // Reset updateClip.
             for (int i = 0; i < views.size(); ++i)
-                views.at(i)->d_func()->setUpdateClip(0);
+                views.at(i)->d_func()->setUpdateClip(nullptr);
         }
     } else if (wasDirtyParentSceneTransform) {
         item->d_ptr->invalidateChildrenSceneTransform();
@@ -5378,7 +5386,7 @@ void QGraphicsScene::drawItems(QPainter *painter,
 
     // Determine view, expose and flags.
     QGraphicsView *view = widget ? qobject_cast<QGraphicsView *>(widget->parentWidget()) : 0;
-    QRegion *expose = 0;
+    QRegion *expose = nullptr;
     const quint32 oldRectAdjust = d->rectAdjust;
     if (view) {
         d->updateAll = false;
@@ -5462,7 +5470,7 @@ bool QGraphicsScene::focusNextPrevChild(bool next)
     }
 
     // The item must be a widget.
-    QGraphicsWidget *widget = 0;
+    QGraphicsWidget *widget = nullptr;
     if (!item) {
         widget = next ? d->tabFocusFirst : d->tabFocusFirst->d_func()->focusPrev;
     } else {
@@ -5478,7 +5486,7 @@ bool QGraphicsScene::focusNextPrevChild(bool next)
     // Run around the focus chain until we find a widget that can take tab focus.
     do {
         if (widget->flags() & QGraphicsItem::ItemIsFocusable
-            && widget->isEnabled() && widget->isVisibleTo(0)
+            && widget->isEnabled() && widget->isVisibleTo(nullptr)
             && (widget->focusPolicy() & Qt::TabFocus)
             && (!item || !item->isPanel() || item->isAncestorOf(widget))
             ) {
@@ -5763,7 +5771,7 @@ void QGraphicsScene::setActiveWindow(QGraphicsWidget *widget)
     }
 
     // Activate the widget's panel (all windows are panels).
-    QGraphicsItem *panel = widget ? widget->panel() : 0;
+    QGraphicsItem *panel = widget ? widget->panel() : nullptr;
     setActivePanel(panel);
 
     // Raise
@@ -5945,7 +5953,7 @@ void QGraphicsScenePrivate::touchEventHandler(QTouchEvent *sceneTouchEvent)
         const QTouchEvent::TouchPoint &touchPoint = sceneTouchEvent->touchPoints().at(i);
 
         // update state
-        QGraphicsItem *item = 0;
+        QGraphicsItem *item = nullptr;
         if (touchPoint.state() == Qt::TouchPointPressed) {
             if (sceneTouchEvent->device()->type() == QTouchDevice::TouchPad) {
                 // on touch-pad devices, send all touch points to the same item
@@ -6103,7 +6111,7 @@ bool QGraphicsScenePrivate::sendTouchBeginEvent(QGraphicsItem *origin, QTouchEve
 
         // If nobody could take focus, clear it.
         if (!stickyFocus && !setFocus)
-            q->setFocusItem(0, Qt::MouseFocusReason);
+            q->setFocusItem(nullptr, Qt::MouseFocusReason);
     }
 
     bool res = false;
@@ -6117,7 +6125,7 @@ bool QGraphicsScenePrivate::sendTouchBeginEvent(QGraphicsItem *origin, QTouchEve
         eventAccepted = touchEvent->isAccepted();
         if (itemForTouchPointId.value(touchEvent->touchPoints().first().id()) == 0) {
             // item was deleted
-            item = 0;
+            item = nullptr;
         } else {
             item->d_ptr->acceptedTouchBeginEvent = (res && eventAccepted);
         }
@@ -6251,7 +6259,7 @@ void QGraphicsScenePrivate::gestureTargetsAtHotSpots(const QSet<QGesture *> &ges
         if (!gesture->hasHotSpot())
             continue;
         const Qt::GestureType gestureType = gesture->gestureType();
-        QList<QGraphicsItem *> items = itemsAtPosition(QPoint(), gesture->d_func()->sceneHotSpot, 0);
+        QList<QGraphicsItem *> items = itemsAtPosition(QPoint(), gesture->d_func()->sceneHotSpot, nullptr);
         for (int j = 0; j < items.size(); ++j) {
             QGraphicsItem *item = items.at(j);
 
@@ -6323,7 +6331,7 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event)
     if (!startedGestures.isEmpty()) {
         QSet<QGesture *> normalGestures; // that have just one target
         QSet<QGesture *> conflictedGestures; // that have multiple possible targets
-        gestureTargetsAtHotSpots(startedGestures, Qt::GestureFlag(0), &cachedItemGestures, 0,
+        gestureTargetsAtHotSpots(startedGestures, Qt::GestureFlag(0), &cachedItemGestures, nullptr,
                                  &normalGestures, &conflictedGestures);
         cachedTargetItems = cachedItemGestures.keys();
         std::sort(cachedTargetItems.begin(), cachedTargetItems.end(), qt_closestItemFirst);
@@ -6497,7 +6505,7 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event)
             }
 
             gestureTargetsAtHotSpots(ignoredGestures, Qt::ReceivePartialGestures,
-                                     &cachedItemGestures, &targetsSet, 0, 0);
+                                     &cachedItemGestures, &targetsSet, nullptr, nullptr);
 
             cachedTargetItems = targetsSet.values();
             std::sort(cachedTargetItems.begin(), cachedTargetItems.end(), qt_closestItemFirst);
@@ -6537,7 +6545,7 @@ void QGraphicsScenePrivate::cancelGesturesForChildren(QGesture *original)
 {
     Q_ASSERT(original);
     QGraphicsItem *originalItem = gestureTargets.value(original);
-    if (originalItem == 0) // we only act on accepted gestures, which implies it has a target.
+    if (originalItem == nullptr) // we only act on accepted gestures, which implies it has a target.
         return;
 
     // iterate over all active gestures and for each find the owner
@@ -6560,13 +6568,13 @@ void QGraphicsScenePrivate::cancelGesturesForChildren(QGesture *original)
     QSet<QGesture *> almostCanceledGestures = canceledGestures;
     QSet<QGesture *>::Iterator setIter;
     while (!almostCanceledGestures.isEmpty()) {
-        QGraphicsObject *target = 0;
+        QGraphicsObject *target = nullptr;
         QSet<QGesture*> gestures;
         setIter = almostCanceledGestures.begin();
         // sort per target item
         while (setIter != almostCanceledGestures.end()) {
             QGraphicsObject *item = gestureTargets.value(*setIter);
-            if (target == 0)
+            if (target == nullptr)
                 target = item;
             if (target == item) {
                 gestures << *setIter;
@@ -6590,7 +6598,7 @@ void QGraphicsScenePrivate::cancelGesturesForChildren(QGesture *original)
                 if (!g->hasHotSpot())
                     continue;
 
-                QList<QGraphicsItem *> items = itemsAtPosition(QPoint(), g->d_func()->sceneHotSpot, 0);
+                QList<QGraphicsItem *> items = itemsAtPosition(QPoint(), g->d_func()->sceneHotSpot, nullptr);
                 for (int j = 0; j < items.size(); ++j) {
                     QGraphicsObject *item = items.at(j)->toGraphicsObject();
                     if (!item)