Merge branch 'stable' into dev

Change-Id: I37d85631ab1165ab91457d8880c4da907a9df73b

1 files changed, 8 insertions, 1 deletions

diff --git a/src/plugins/platforms/xcb/qxcbclipboard.h b/src/plugins/platforms/xcb/qxcbclipboard.h
index 61cdce3d1d..03021aa606 100644
--- a/src/plugins/platforms/xcb/qxcbclipboard.h
+++ b/src/plugins/platforms/xcb/qxcbclipboard.h
@@ -78,11 +78,15 @@ public:
     void handleSelectionClearRequest(xcb_selection_clear_event_t *event);
     void handleXFixesSelectionRequest(xcb_xfixes_selection_notify_event_t *event);
 
-    bool clipboardReadProperty(xcb_window_t win, xcb_atom_t property, bool deleteProperty, QByteArray *buffer, int *size, xcb_atom_t *type, int *format) const;
+    bool clipboardReadProperty(xcb_window_t win, xcb_atom_t property, bool deleteProperty, QByteArray *buffer, int *size, xcb_atom_t *type, int *format);
     QByteArray clipboardReadIncrementalProperty(xcb_window_t win, xcb_atom_t property, int nbytes, bool nullterm);
 
     QByteArray getDataInFormat(xcb_atom_t modeAtom, xcb_atom_t fmtatom);
 
+    void setProcessIncr(bool process) { m_incr_active = process; }
+    bool processIncr() { return m_incr_active; }
+    void incrTransactionPeeker(xcb_generic_event_t *ge, bool &accepted);
+
     xcb_window_t getSelectionOwner(xcb_atom_t atom) const;
     QByteArray getSelection(xcb_atom_t selection, xcb_atom_t target, xcb_atom_t property, xcb_timestamp_t t = 0);
 
@@ -107,6 +111,9 @@ private:
 
     static const int clipboard_timeout;
 
+    bool m_incr_active;
+    bool m_clipboard_closing;
+    xcb_timestamp_t m_incr_receive_time;
 };
 
 #endif // QT_NO_CLIPBOARD