1
1
diff --git a/src/gui/kernel/qguiapplication_platform.h b/src/gui/kernel/qguiapplication_platform.h
2
- index 545bf75c84..68459a9636 100644
2
+ index 98e19427ae7..eddc92d886c 100644
3
3
--- a/src/gui/kernel/qguiapplication_platform.h
4
4
+++ b/src/gui/kernel/qguiapplication_platform.h
5
5
@@ -21,6 +21,7 @@
@@ -10,7 +10,7 @@ index 545bf75c84..68459a9636 100644
10
10
#endif
11
11
12
12
#if QT_CONFIG(wayland)
13
- @@ -43 ,6 +44 ,7 @@ struct Q_GUI_EXPORT QX11Application
13
+ @@ -59 ,6 +60 ,7 @@ struct Q_GUI_EXPORT QX11Application
14
14
QT_DECLARE_NATIVE_INTERFACE(QX11Application, 1, QGuiApplication)
15
15
virtual Display *display() const = 0;
16
16
virtual xcb_connection_t *connection() const = 0;
@@ -19,19 +19,19 @@ index 545bf75c84..68459a9636 100644
19
19
#endif
20
20
21
21
diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h
22
- index d7b5120332..89baaa48aa 100644
22
+ index 7b2ad6e1ce0..dfe7f1fbf73 100644
23
23
--- a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h
24
24
+++ b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h
25
25
@@ -34,6 +34,7 @@ public:
26
26
#if QT_CONFIG(xcb)
27
27
Display *display() const override;
28
- xcb_connection_t *connection() const override { return nullptr; };
29
- + xkb_state *xkbState() const override { return nullptr; };
28
+ xcb_connection_t *connection() const override { return nullptr; }
29
+ + xkb_state *xkbState() const override { return nullptr; }
30
30
#endif
31
31
QScopedPointer<QOffscreenX11Connection> m_connection;
32
32
};
33
33
diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.h b/src/plugins/platforms/xcb/qxcbkeyboard.h
34
- index 62d9268c64..ff1e42468d 100644
34
+ index 62d9268c64f..ff1e42468d3 100644
35
35
--- a/src/plugins/platforms/xcb/qxcbkeyboard.h
36
36
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.h
37
37
@@ -50,6 +50,8 @@ public:
@@ -44,7 +44,7 @@ index 62d9268c64..ff1e42468d 100644
44
44
void handleKeyEvent(xcb_window_t sourceWindow, QEvent::Type type, xcb_keycode_t code,
45
45
quint16 state, xcb_timestamp_t time, bool fromSendEvent);
46
46
diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
47
- index 06f5241d8c..03bb8c331b 100644
47
+ index 06f5241d8c0..03bb8c331b0 100644
48
48
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
49
49
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
50
50
@@ -4,6 +4,7 @@
@@ -71,7 +71,7 @@ index 06f5241d8c..03bb8c331b 100644
71
71
{
72
72
QXcbIntegration *integration = static_cast<QXcbIntegration *>(QGuiApplicationPrivate::platformIntegration());
73
73
diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.h b/src/plugins/platforms/xcb/qxcbnativeinterface.h
74
- index 62bfb4c634..5cc5c045ad 100644
74
+ index 62bfb4c634f..5cc5c045ad8 100644
75
75
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.h
76
76
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.h
77
77
@@ -79,6 +79,7 @@ public:
0 commit comments