From 73746a5a897297fe499e90e972bbbf736f0cfbba Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 23 Jun 2011 18:07:20 +0200 Subject: Have the selection offer global handled always without delay. In a previous attempt to solve the problem of selection offer globals arriving too early, the handling was delayed. This solved the issue of crashing but introduced a timing issue, because the offers (the mime types) will arrive immediately after the global and therefore will simply be ignored in case the delayed processing of the selection offer had not yet been done. The visibility of the problem depended on the implementation of the compositor, with recent changes to qt-compositor the issue is very visible. The patch solves the issue properly: The wayland clipboard instance is created right away, as early when needed, and the integration will simply pick up the already created instance. Change-Id: I75aaba4b0590c05cc0091bed7bb3593186c1188f Reviewed-on: http://codereview.qt.nokia.com/687 Reviewed-by: Qt Sanity Bot Reviewed-by: Paul Olav Tvete --- src/plugins/platforms/wayland/qwaylandintegration.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/plugins/platforms/wayland/qwaylandintegration.h') diff --git a/src/plugins/platforms/wayland/qwaylandintegration.h b/src/plugins/platforms/wayland/qwaylandintegration.h index c7dc89d928..f617d9697b 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.h +++ b/src/plugins/platforms/wayland/qwaylandintegration.h @@ -74,7 +74,6 @@ private: QWaylandDisplay *mDisplay; bool mUseOpenGL; QPlatformNativeInterface *mNativeInterface; - mutable QPlatformClipboard *mClipboard; }; QT_END_NAMESPACE -- cgit v1.2.3