[LyX/master] Fix an overloaded-virtual warning for type mismatch of event parameter (Qt6)

Stephan Witt switt at lyx.org
Thu Dec 9 20:31:59 UTC 2021


commit 4665baac4625326d64ba46200968de44b1f2bb09
Author: Stephan Witt <switt at lyx.org>
Date:   Thu Dec 9 21:58:14 2021 +0100

    Fix an overloaded-virtual warning for type mismatch of event parameter (Qt6)
---
 src/frontends/qt/IconPalette.cpp |    4 ++++
 src/frontends/qt/IconPalette.h   |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/frontends/qt/IconPalette.cpp b/src/frontends/qt/IconPalette.cpp
index 33ceb29..45d774b 100644
--- a/src/frontends/qt/IconPalette.cpp
+++ b/src/frontends/qt/IconPalette.cpp
@@ -54,7 +54,11 @@ void TearOff::mouseReleaseEvent(QMouseEvent * /*event*/)
 }
 
 
+#if QT_VERSION < 0x060000
 void TearOff::enterEvent(QEvent * event)
+#else
+void TearOff::enterEvent(QEnterEvent * event)
+#endif
 {
 	highlighted_ = true;
 	update();
diff --git a/src/frontends/qt/IconPalette.h b/src/frontends/qt/IconPalette.h
index 50c68a3..e9f8101 100644
--- a/src/frontends/qt/IconPalette.h
+++ b/src/frontends/qt/IconPalette.h
@@ -30,7 +30,7 @@ public:
 #if QT_VERSION < 0x060000
 	void enterEvent(QEvent *) override;
 #else
-	void enterEvent(QEvent *);
+	void enterEvent(QEnterEvent *) override;
 #endif
 	void leaveEvent(QEvent *) override;
 	void mouseReleaseEvent (QMouseEvent *) override;


More information about the lyx-cvs mailing list