From 5c49c33ab088a926577d3798ef90baac86e5794a Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Mon, 7 Jan 2013 17:15:14 -0200 Subject: Fix Blackberry QPA plugin clipboard impl QBBCliboard::setMimeData was not cleaning the system clipboard aproppriately when m_mimeData != 0 but m_mimeData->userMimeData == 0, as it would return early before the empty_clipboard() statement. Also, we must not dataChanged() signal after the clipboard has been changed, because this is done by the parent class. cherry-picked from qt5/qtbase 0a977e36e06a69583d8e4edc27ca3df634c53404 Change-Id: I694490e26035d75c3c54e76c538982037c3ef799 Reviewed-by: Sean Harmer --- src/plugins/platforms/blackberry/qbbclipboard.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/blackberry/qbbclipboard.cpp b/src/plugins/platforms/blackberry/qbbclipboard.cpp index e26b299..dbcee5a 100644 --- a/src/plugins/platforms/blackberry/qbbclipboard.cpp +++ b/src/plugins/platforms/blackberry/qbbclipboard.cpp @@ -190,7 +190,10 @@ void QBBClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode) if (mode != QClipboard::Clipboard) return; - if (data == m_mimeData || data == m_mimeData->userMimeData()) + if (m_mimeData == data) + return; + + if (m_mimeData->userMimeData() && m_mimeData->userMimeData() == data) return; empty_clipboard(); @@ -220,7 +223,6 @@ void QBBClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode) m_mimeData->addFormatToCheck(format); } - emitChanged(QClipboard::Clipboard); } QMimeData* QBBClipboard::mimeData(QClipboard::Mode mode) -- cgit v0.12