Merge branch 'stable' into dev

Change-Id: I7f0dab6bdb1f3cc1d3e6c30166ff6db9dfae37e9

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;