Use correct version of patch 044
This commit is contained in:
parent
d7b0d9a62f
commit
6982ac0636
@ -58,7 +58,7 @@ Patch40: 0040-Client-Delay-deletion-of-QDrag-object-until-after-we.patch
|
||||
Patch41: 0041-Client-Avoid-processing-of-events-when-showing-windo.patch
|
||||
Patch42: 0042-Handle-registry_global-out-of-constructor.patch
|
||||
Patch43: 0043-Connect-flushRequest-after-forceRoundTrip.patch
|
||||
Patch44: 0044-Move-the-wayland-socket-polling-to-a-separate-event-2.patch
|
||||
Patch44: 0044-Move-the-wayland-socket-polling-to-a-separate-event-.patch
|
||||
## rebased patch44 when patch43 is omitted -- rdieter
|
||||
# Patch44: 0044-Move-the-wayland-socket-polling-to-a-separate-event-2.patch
|
||||
Patch45: 0045-Check-pointer-for-null-before-use-in-ASSERT.patch
|
||||
|
@ -17,17 +17,17 @@ Change-Id: I650481f49a47ed1a9778c7e1bc3c48db6e8f0031
|
||||
---
|
||||
|
||||
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
|
||||
index 5937172..414fe3f 100644
|
||||
index 6f1bada..86045a3 100644
|
||||
--- a/src/client/qwaylanddisplay.cpp
|
||||
+++ b/src/client/qwaylanddisplay.cpp
|
||||
@@ -728,50 +728,9 @@
|
||||
@@ -611,50 +611,9 @@ uint32_t QWaylandDisplay::currentTimeMillisec()
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
-static void
|
||||
-sync_callback(void *data, struct wl_callback *callback, uint32_t serial)
|
||||
-{
|
||||
- Q_UNUSED(serial);
|
||||
- Q_UNUSED(serial)
|
||||
- bool *done = static_cast<bool *>(data);
|
||||
-
|
||||
- *done = true;
|
||||
@ -70,5 +70,6 @@ index 5937172..414fe3f 100644
|
||||
- wl_callback_destroy(callback);
|
||||
+ wl_display_roundtrip(mDisplay);
|
||||
}
|
||||
|
||||
|
||||
bool QWaylandDisplay::supportsWindowDecoration() const
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user