Commit d16acbd2 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix more qt6 compile error

parent 72ceb7bd
Pipeline #136373 passed with stage
in 49 seconds
......@@ -259,7 +259,11 @@ void FloatingToolBar::mouseMoveEvent(QMouseEvent *e)
QToolBar::mouseMoveEvent(e);
}
void FloatingToolBar::enterEvent(QEvent *e)
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void FloatingToolBar::enterEvent(QEnterEvent *e)
#else
void FloatingToolBar::enterEvent(QEvent *e)
#endif
{
// Stop the autohide timer while the mouse is inside
d->autoHideTimer->stop();
......
......@@ -44,7 +44,11 @@ protected:
void paintEvent(QPaintEvent *) override;
void mousePressEvent(QMouseEvent *e) override;
void mouseMoveEvent(QMouseEvent *e) override;
void enterEvent(QEvent *e) override;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void enterEvent(QEnterEvent *event) override;
#else
void enterEvent(QEvent*) override;
#endif
void leaveEvent(QEvent *e) override;
void mouseReleaseEvent(QMouseEvent *e) override;
void wheelEvent(QWheelEvent *e) override;
......
......@@ -9,7 +9,7 @@
#include "krdc_debug.h"
#include <KLocalizedString>
#include<KCoreAddons/KFormat>
#include <KFormat>
#ifdef BUILD_ZEROCONF
#include <kdnssd_version.h>
#include <KDNSSD/ServiceBrowser>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment