vcl/inc/qt5/QtWidget.hxx | 4 ++++
vcl/qt5/QtWidget.cxx | 9 ++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 5d56255c22c79b72c1cedb48cfe0a200f89bdc66
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Apr 21 05:37:30 2022 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Apr 21 06:41:29 2022 +0200
qt6: Fix build (QtWidget::enterEvent)
In Qt 6, `QWidget::enterEvent` takes a
`QEnterEvent*` param.
An override for `QtWidget` was added in
commit dc886bc6de2c0061a840bea2426663c3be2ecd26
Date: Tue Apr 19 16:03:56 2022 +0200
tdf#140463 Qt handle mouse enter+leave events
Change-Id: I47579ce6686da321533afcef2e4436e315901059
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133235
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/inc/qt5/QtWidget.hxx b/vcl/inc/qt5/QtWidget.hxx
index 2ebe83fcbae1..4a40589b16ba 100644
--- a/vcl/inc/qt5/QtWidget.hxx
+++ b/vcl/inc/qt5/QtWidget.hxx
@@ -77,7 +77,11 @@ class QtWidget : public QWidget
virtual void closeEvent(QCloseEvent*) override;
virtual void changeEvent(QEvent*) override;
virtual void leaveEvent(QEvent*) override;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ virtual void enterEvent(QEnterEvent*) override;
+#else
virtual void enterEvent(QEvent*) override;
+#endif
void inputMethodEvent(QInputMethodEvent*) override;
QVariant inputMethodQuery(Qt::InputMethodQuery) const override;
diff --git a/vcl/qt5/QtWidget.cxx b/vcl/qt5/QtWidget.cxx
index 2ac27548ac6a..235e85103d50 100644
--- a/vcl/qt5/QtWidget.cxx
+++ b/vcl/qt5/QtWidget.cxx
@@ -233,7 +233,14 @@ void QtWidget::handleMouseEnterLeaveEvents(const QtFrame&
rFrame, QEvent* pQEven
void QtWidget::leaveEvent(QEvent* pEvent) {
handleMouseEnterLeaveEvents(m_rFrame, pEvent); }
-void QtWidget::enterEvent(QEvent* pEvent) {
handleMouseEnterLeaveEvents(m_rFrame, pEvent); }
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+void QtWidget::enterEvent(QEnterEvent* pEvent)
+#else
+void QtWidget::enterEvent(QEvent* pEvent)
+#endif
+{
+ handleMouseEnterLeaveEvents(m_rFrame, pEvent);
+}
void QtWidget::wheelEvent(QWheelEvent* pEvent)
{
