diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-02 12:05:19 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-02 12:29:17 +0200 |
commit | f2627a6e46a64cd2ed4eb1e14f2fb5c54671be4f (patch) | |
tree | d9f863f7110b0b5ff56f9c3ed0cb974c6864ed17 | |
parent | c1a4d556990ee9a3195bb3e42a7f85f1a272a04a (diff) |
Follow up on change to QWidget::enterEvent signature in qtbase
The QEvent instance received by the event handler is a QEnterEvent,
so safe to forward it either way. InspectTool doesn't override
enterEvent from QWidget, so that signature can be anything.
Change-Id: I0c685ac7e53013cdefdffb1e0c99518276204ebc
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
3 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp b/src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp index 24f81c73ff..597c9246cc 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp @@ -71,7 +71,7 @@ InspectTool::InspectTool(QQuickWindowInspector *inspector, QQuickWindow *view) : connect(&m_nameDisplayTimer, &QTimer::timeout, this, &InspectTool::showItemName); } -void InspectTool::enterEvent(QEvent *) +void InspectTool::enterEvent(QEnterEvent *) { m_hoverHighlight->setVisible(true); } diff --git a/src/plugins/qmltooling/qmldbg_inspector/inspecttool.h b/src/plugins/qmltooling/qmldbg_inspector/inspecttool.h index 933c162dad..818729b0a9 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/inspecttool.h +++ b/src/plugins/qmltooling/qmldbg_inspector/inspecttool.h @@ -51,6 +51,7 @@ class QQuickItem; class QMouseEvent; class QKeyEvent; class QTouchEvent; +class QEnterEvent; namespace QmlJSDebugger { @@ -64,7 +65,7 @@ class InspectTool : public QObject public: InspectTool(QQuickWindowInspector *inspector, QQuickWindow *view); - void enterEvent(QEvent *); + void enterEvent(QEnterEvent *); void leaveEvent(QEvent *); void mousePressEvent(QMouseEvent *); void mouseMoveEvent(QMouseEvent *); diff --git a/src/plugins/qmltooling/qmldbg_inspector/qquickwindowinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/qquickwindowinspector.cpp index 09eb6bfc28..caa9bf784d 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qquickwindowinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qquickwindowinspector.cpp @@ -132,7 +132,7 @@ bool QQuickWindowInspector::eventFilter(QObject *obj, QEvent *event) switch (event->type()) { case QEvent::Enter: - m_tool->enterEvent(event); + m_tool->enterEvent(static_cast<QEnterEvent*>(event)); return true; case QEvent::Leave: m_tool->leaveEvent(event); |