summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorMorten Johan Sorvig <morten.sorvig@nokia.com>2012-03-16 13:05:37 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-17 07:06:42 +0100
commitb6bce2dd7565329b2ca2a95c316f81293a6a5fe7 (patch)
treefddeff7bb7ef1aac44ca40e60a6bcdd490b0cf4e /src/plugins/platforms
parent437da962c2b486b1a1722aac003bfa00b93ac204 (diff)
QCocoaClipboard: Make QClipboard::clear() clear.
Change-Id: Ifb235d015f7831b335a9c3db92515a8d1cd49311 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/cocoa/qcocoaclipboard.mm4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaclipboard.mm b/src/plugins/platforms/cocoa/qcocoaclipboard.mm
index 799fb85183..87c085457f 100644
--- a/src/plugins/platforms/cocoa/qcocoaclipboard.mm
+++ b/src/plugins/platforms/cocoa/qcocoaclipboard.mm
@@ -64,6 +64,10 @@ QMimeData *QCocoaClipboard::mimeData(QClipboard::Mode mode)
void QCocoaClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode)
{
if (QMacPasteboard *pasteBoard = pasteboardForMode(mode)) {
+ if (data == 0) {
+ pasteBoard->clear();
+ }
+
pasteBoard->sync();
pasteBoard->setMimeData(data);
emitChanged(mode);