Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Network
KRDC
Commits
d16acbd2
Commit
d16acbd2
authored
Feb 12, 2022
by
Laurent Montel
Browse files
Fix more qt6 compile error
parent
72ceb7bd
Pipeline
#136373
passed with stage
in 49 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
floatingtoolbar.cpp
View file @
d16acbd2
...
...
@@ -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
();
...
...
floatingtoolbar.h
View file @
d16acbd2
...
...
@@ -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
;
...
...
remotedesktopsmodel.cpp
View file @
d16acbd2
...
...
@@ -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>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment