diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 11:49:43 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 11:49:47 +0100 |
commit | 63f24f6ba8417e90294a1a90d01a3c3de80b7af4 (patch) | |
tree | 27b5788a3e7c1e94b484e642142b1be8ff8da318 /src/plugins/platforms/qnx | |
parent | ae2359d49e171c61450b17b1eb0e0dd7a20c7ca4 (diff) | |
parent | 05659223bf02c8bac0463fe1e7a9364ef5677b75 (diff) |
Merge branch 'stable' into dev
Change-Id: I7f0dab6bdb1f3cc1d3e6c30166ff6db9dfae37e9
Diffstat (limited to 'src/plugins/platforms/qnx')
-rw-r--r-- | src/plugins/platforms/qnx/qqnxclipboard.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/platforms/qnx/qqnxclipboard.cpp b/src/plugins/platforms/qnx/qqnxclipboard.cpp index 47b9cd438c..8286febd35 100644 --- a/src/plugins/platforms/qnx/qqnxclipboard.cpp +++ b/src/plugins/platforms/qnx/qqnxclipboard.cpp @@ -186,7 +186,10 @@ void QQnxClipboard::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(); @@ -194,8 +197,10 @@ void QQnxClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode) m_mimeData->clear(); m_mimeData->setUserMimeData(data); - if (data == 0) + if (data == 0) { + emitChanged(QClipboard::Clipboard); return; + } const QStringList formats = data->formats(); qClipboardDebug() << Q_FUNC_INFO << "formats=" << formats; |