Skip to content

Commit d84bc8b

Browse files
committed
Fix enterEvent not firing on Qt6
1 parent ed059ab commit d84bc8b

8 files changed

Lines changed: 33 additions & 1 deletion

File tree

canvas.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,11 @@ void Canvas::wheelEvent(QWheelEvent *event)
449449
}
450450
}
451451

452+
#if QT_VERSION_MAJOR > 5
453+
void Canvas::enterEvent(QEnterEvent* event)
454+
#else
452455
void Canvas::enterEvent(QEvent* event)
456+
#endif
453457
{
454458
if (!project.statusbar)
455459
return;

canvas.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ class Canvas : public QGraphicsView
4949
void mouseMoveEvent(QMouseEvent* event);
5050
void mouseReleaseEvent(QMouseEvent* event);
5151
void wheelEvent(QWheelEvent* event);
52+
#if QT_VERSION_MAJOR > 5
53+
void enterEvent(QEnterEvent* event);
54+
#else
5255
void enterEvent(QEvent* event);
56+
#endif
5357
void leaveEvent(QEvent* event);
5458

5559
private slots:

paletteedit.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,11 @@ void PaletteEdit::UpdateColorStatus(bool force)
133133
}
134134
}
135135

136+
#if QT_VERSION_MAJOR > 5
137+
void PaletteEdit::enterEvent(QEnterEvent* event)
138+
#else
136139
void PaletteEdit::enterEvent(QEvent* event)
140+
#endif
137141
{
138142
if (!project.statusbar)
139143
return;

paletteedit.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ private slots:
3030
bool block_pal_updates= false;
3131
MainWindow* main_window;
3232

33+
#if QT_VERSION_MAJOR > 5
34+
void enterEvent(QEnterEvent* event);
35+
#else
3336
void enterEvent(QEvent* event);
37+
#endif
3438
void leaveEvent(QEvent* event);
3539
};
3640

tilepicker.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@ void TilePicker::resizeEvent(QResizeEvent* event)
127127
Update();
128128
}
129129

130+
#if QT_VERSION_MAJOR > 5
131+
void TilePicker::enterEvent(QEnterEvent* event)
132+
#else
130133
void TilePicker::enterEvent(QEvent* event)
134+
#endif
131135
{
132136
if (!project.statusbar)
133137
return;

tilepicker.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ private slots:
3030
Ui::TilePicker *ui;
3131
MainWindow* main_window;
3232

33+
#if QT_VERSION_MAJOR > 5
34+
void enterEvent(QEnterEvent* event);
35+
#else
3336
void enterEvent(QEvent* event);
37+
#endif
3438
void leaveEvent(QEvent* event);
3539
};
3640

toolboxpanel.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,11 @@ void ToolBoxPanel::changeEvent(QEvent* event)
9797
}
9898
}
9999

100-
void ToolBoxPanel::enterEvent(QEvent* event)
100+
#if QT_VERSION_MAJOR > 5
101+
void ToolBoxPanel::enterEvent(QEnterEvent* event)
102+
#else
103+
void ToolToolBoxPanel::enterEvent(QEvent* event)
104+
#endif
101105
{
102106
if (!project.statusbar)
103107
return;

toolboxpanel.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ class ToolBoxPanel : public QDockWidget
2727
private:
2828
Ui::ToolBoxPanel *ui;
2929

30+
#if QT_VERSION_MAJOR > 5
31+
void enterEvent(QEnterEvent* event);
32+
#else
3033
void enterEvent(QEvent* event);
34+
#endif
3135
void leaveEvent(QEvent* event);
3236
void changeEvent(QEvent* event);
3337
};

0 commit comments

Comments
 (0)