Skip to content

Commit 61bbaca

Browse files
ilya-fedinjohn-preston
authored andcommitted
Update Qt 6.8.1 -> 6.8.2
1 parent 140cd18 commit 61bbaca

35 files changed

+12
-12
lines changed
File renamed without changes.

qtbase_6.8.1/0026-xcb-provide-xkb-state.patch qtbase_6.8.2/0026-xcb-provide-xkb-state.patch

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
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
33
--- a/src/gui/kernel/qguiapplication_platform.h
44
+++ b/src/gui/kernel/qguiapplication_platform.h
55
@@ -21,6 +21,7 @@
@@ -10,7 +10,7 @@ index 545bf75c84..68459a9636 100644
1010
#endif
1111

1212
#if QT_CONFIG(wayland)
13-
@@ -43,6 +44,7 @@ struct Q_GUI_EXPORT QX11Application
13+
@@ -59,6 +60,7 @@ struct Q_GUI_EXPORT QX11Application
1414
QT_DECLARE_NATIVE_INTERFACE(QX11Application, 1, QGuiApplication)
1515
virtual Display *display() const = 0;
1616
virtual xcb_connection_t *connection() const = 0;
@@ -19,19 +19,19 @@ index 545bf75c84..68459a9636 100644
1919
#endif
2020

2121
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
2323
--- a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h
2424
+++ b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h
2525
@@ -34,6 +34,7 @@ public:
2626
#if QT_CONFIG(xcb)
2727
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; }
3030
#endif
3131
QScopedPointer<QOffscreenX11Connection> m_connection;
3232
};
3333
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
3535
--- a/src/plugins/platforms/xcb/qxcbkeyboard.h
3636
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.h
3737
@@ -50,6 +50,8 @@ public:
@@ -44,7 +44,7 @@ index 62d9268c64..ff1e42468d 100644
4444
void handleKeyEvent(xcb_window_t sourceWindow, QEvent::Type type, xcb_keycode_t code,
4545
quint16 state, xcb_timestamp_t time, bool fromSendEvent);
4646
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
4848
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
4949
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
5050
@@ -4,6 +4,7 @@
@@ -71,7 +71,7 @@ index 06f5241d8c..03bb8c331b 100644
7171
{
7272
QXcbIntegration *integration = static_cast<QXcbIntegration *>(QGuiApplicationPrivate::platformIntegration());
7373
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
7575
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.h
7676
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.h
7777
@@ -79,6 +79,7 @@ public:

qtwayland_6.8.1/0002-scale-transparency-filling.patch qtwayland_6.8.2/0002-scale-transparency-filling.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/client/qwaylandshmbackingstore.cpp b/src/client/qwaylandshmbackingstore.cpp
2-
index d77c548a..05b799df 100644
2+
index b1ae2e1a..dc9789e5 100644
33
--- a/src/client/qwaylandshmbackingstore.cpp
44
+++ b/src/client/qwaylandshmbackingstore.cpp
55
@@ -14,6 +14,7 @@
@@ -9,8 +9,8 @@ index d77c548a..05b799df 100644
99
+#include <QtGui/private/qhighdpiscaling_p.h>
1010
#include <QtWaylandClient/private/wayland-wayland-client-protocol.h>
1111

12-
#include <fcntl.h>
13-
@@ -178,14 +179,14 @@ void QWaylandShmBackingStore::updateDirtyStates(const QRegion &region)
12+
#include <memory>
13+
@@ -182,14 +183,14 @@ void QWaylandShmBackingStore::updateDirtyStates(const QRegion &region)
1414
}
1515
}
1616

@@ -27,7 +27,7 @@ index d77c548a..05b799df 100644
2727

2828
// Although undocumented, QBackingStore::beginPaint expects the painted region
2929
// to be cleared before use if the window has a surface format with an alpha.
30-
@@ -193,6 +194,7 @@ void QWaylandShmBackingStore::beginPaint(const QRegion &region)
30+
@@ -197,6 +198,7 @@ void QWaylandShmBackingStore::beginPaint(const QRegion &region)
3131
if (!bufferWasRecreated && mBackBuffer->image()->hasAlphaChannel()) {
3232
QPainter p(paintDevice());
3333
p.setCompositionMode(QPainter::CompositionMode_Source);

0 commit comments

Comments
 (0)