diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:33:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:33:26 +0200 |
| commit | 6feec9da93032d11a768802ac2187d9d4153b1ec (patch) | |
| tree | dada90d2b99127de0be833ded5554b37169f3432 /src/plugins/platforms/xcb/qxcbclipboard.h | |
| parent | d5e3dca8c56f60e0da5d707dbbe0c424b75c947a (diff) | |
| parent | c3605980d95f28d8ab6dc11eb349ad87ed3adaa9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I34b5e290233d0869fbafac094a939aec2bf83fd5
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbclipboard.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbclipboard.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbclipboard.h b/src/plugins/platforms/xcb/qxcbclipboard.h index 58c7f32c4c..ffd565c56f 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.h +++ b/src/plugins/platforms/xcb/qxcbclipboard.h @@ -98,7 +98,7 @@ private: QClipboard::Mode modeForAtom(xcb_atom_t atom) const; // Selection and Clipboard - QXcbClipboardMime *m_xClipboard[2]; + QScopedPointer<QXcbClipboardMime> m_xClipboard[2]; QMimeData *m_clientClipboard[2]; xcb_timestamp_t m_timestamp[2]; |