qt5: fix crash in QXcbEventReader (patch from upstream via Arch).

This commit is contained in:
Juan RP 2015-02-09 09:03:34 +01:00
parent 65d23334f9
commit 9ed817803c
2 changed files with 40 additions and 1 deletions

View file

@ -0,0 +1,39 @@
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

View file

@ -1,7 +1,7 @@
# Template file for 'qt5'
pkgname=qt5
version=5.4.0
revision=2
revision=3
wrksrc="qt-everywhere-opensource-src-${version}"
homepage="http://qt-project.com/"
short_desc="A cross-platform application and UI framework (QT5)"