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
Education
KTouch
Commits
e1b827bc
Commit
e1b827bc
authored
Mar 08, 2022
by
Laurent Montel
Browse files
Fix signature in qt6
parent
43488d69
Pipeline
#148532
passed with stage
in 1 minute and 35 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/x11_helper.cpp
View file @
e1b827bc
...
...
@@ -351,7 +351,11 @@ bool XEventNotifier::processXkbEvents(xcb_generic_event_t* event)
return
true
;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
bool
XEventNotifier
::
nativeEventFilter
(
const
QByteArray
&
eventType
,
void
*
message
,
long
*
)
#else
bool
XEventNotifier
::
nativeEventFilter
(
const
QByteArray
&
eventType
,
void
*
message
,
qintptr
*
)
#endif
{
// kDebug() << "event type:" << eventType;
if
(
eventType
==
"xcb_generic_event_t"
)
{
...
...
src/x11_helper.h
View file @
e1b827bc
...
...
@@ -104,7 +104,11 @@ protected:
// bool x11Event(XEvent * e);
virtual
bool
processOtherEvents
(
xcb_generic_event_t
*
e
);
virtual
bool
processXkbEvents
(
xcb_generic_event_t
*
e
);
virtual
bool
nativeEventFilter
(
const
QByteArray
&
eventType
,
void
*
message
,
long
*
)
Q_DECL_OVERRIDE
;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
bool
nativeEventFilter
(
const
QByteArray
&
eventType
,
void
*
message
,
long
*
result
)
override
;
#else
bool
nativeEventFilter
(
const
QByteArray
&
eventType
,
void
*
message
,
qintptr
*
result
)
override
;
#endif
private:
int
registerForXkbEvents
(
Display
*
display
);
...
...
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