From 085db4f33fbabe4b423bb328904da90f93b13868 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 5 Dec 2021 17:18:19 +0100 Subject: [PATCH] WIP: enterEvent has a different signature in Qt6 --- src/laybasic/laybasic/layViewObject.cc | 4 ++++ src/laybasic/laybasic/layViewObject.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/laybasic/laybasic/layViewObject.cc b/src/laybasic/laybasic/layViewObject.cc index 9effcf08c..db61cfc3b 100644 --- a/src/laybasic/laybasic/layViewObject.cc +++ b/src/laybasic/laybasic/layViewObject.cc @@ -684,7 +684,11 @@ END_PROTECTED } void +#if QT_VERSION >= 0x60000 +ViewObjectWidget::enterEvent (QEnterEvent * /*event*/) +#else ViewObjectWidget::enterEvent (QEvent * /*event*/) +#endif { BEGIN_PROTECTED m_mouse_inside = true; diff --git a/src/laybasic/laybasic/layViewObject.h b/src/laybasic/laybasic/layViewObject.h index 0e8b4565a..04a2cccfc 100644 --- a/src/laybasic/laybasic/layViewObject.h +++ b/src/laybasic/laybasic/layViewObject.h @@ -1029,7 +1029,11 @@ protected: /** * @brief Qt mouse enter event handler */ +#if QT_VERSION >= 0x60000 + void enterEvent (QEnterEvent *e); +#else void enterEvent (QEvent *e); +#endif /** * @brief Qt mouse button press event handler