40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
|
From 6a7ee92b3958e3a3ebc16be15f8bd34217ec7bd2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
|
||
|
|
Date: Wed, 10 Dec 2014 07:27:23 +0100
|
||
|
|
Subject: [PATCH] Handle SelectionClientClose in QXcbClipboard
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
QXcbClipboard listens for subtype SelectionClientClose of Xfixes
|
||
|
|
SelectionNotify event, but doesn't handle it. When the client holding
|
||
|
|
the clipboard selection closes the Clipboard becomes empty and thus the
|
||
|
|
change should be emitted.
|
||
|
|
|
||
|
|
This fixes downstream KDE Bug #329174.
|
||
|
|
|
||
|
|
Change-Id: I19fb8cfd7bd3b249c0bc6ca2a724a9aeeb05ac7e
|
||
|
|
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
|
||
|
|
Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org>
|
||
|
|
---
|
||
|
|
src/plugins/platforms/xcb/qxcbclipboard.cpp | 3 ++-
|
||
|
|
1 files changed, 2 insertions(+), 1 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp
|
||
|
|
index 8b3893e..f56a29d 100644
|
||
|
|
--- qtbase/src/plugins/platforms/xcb/qxcbclipboard.cpp
|
||
|
|
+++ qtbase/src/plugins/platforms/xcb/qxcbclipboard.cpp
|
||
|
|
@@ -742,7 +742,8 @@ void QXcbClipboard::handleXFixesSelectionRequest(xcb_xfixes_selection_notify_eve
|
||
|
|
m_xClipboard[mode]->reset();
|
||
|
|
}
|
||
|
|
emitChanged(mode);
|
||
|
|
- }
|
||
|
|
+ } else if (event->subtype == XCB_XFIXES_SELECTION_EVENT_SELECTION_CLIENT_CLOSE)
|
||
|
|
+ emitChanged(mode);
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.1
|
||
|
|
|