From 89391da882d981a92e5f86e1d049d2e24baf9b2b Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 11 Nov 2020 00:12:10 +0100 Subject: Fix QGraphicsView's abuse of QEvent's d-pointer in Leave event handling QGraphicsSceneEvent carries a widget pointer, and we can add a new event type. Assert that QGraphicsScene doesn't get Leave events from elsewhere. This was the only "usage" of QEvent's d-pointer in Qt, so with this gone we can reduce the size of QEvent by 8 bytes. Change-Id: I0513daf742de9084d0469d55b7a7f41b667e8081 Reviewed-by: Shawn Rutledge Reviewed-by: Lars Knoll --- src/corelib/kernel/qcoreevent.cpp | 1 + src/corelib/kernel/qcoreevent.h | 1 + 2 files changed, 2 insertions(+) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index ceb1a35775..de526d6085 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -153,6 +153,7 @@ QT_BEGIN_NAMESPACE \value GraphicsSceneMove Widget was moved (QGraphicsSceneMoveEvent). \value GraphicsSceneResize Widget was resized (QGraphicsSceneResizeEvent). \value GraphicsSceneWheel Mouse wheel rolled in a graphics scene (QGraphicsSceneWheelEvent). + \value GraphicsSceneLeave The cursor leaves a graphics scene (QGraphicsSceneWheelEvent). \value Hide Widget was hidden (QHideEvent). \value HideToParent A child widget has been hidden. \value HoverEnter The mouse cursor enters a hover widget (QHoverEvent). diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 4beb064d92..dbca4adaab 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -205,6 +205,7 @@ public: GraphicsSceneDragLeave = 166, GraphicsSceneDrop = 167, GraphicsSceneWheel = 168, + GraphicsSceneLeave = 220, KeyboardLayoutChange = 169, // keyboard layout changed -- cgit v1.2.3