summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-02-15 12:34:04 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-18 00:00:21 +0100
commite0d9fade038130ad408715e946c5c08cd2faf81e (patch)
tree00b1e93bc31a43b614fb4fd12b3d4184592aae8c /src/plugins/platforms
parent844b096d674c3b803923357502435ef89ce0c738 (diff)
Fix qclipboard autotest on Windows.
Emit changed signal only if the clipboard is not owned, in which case QClipboard does it. Task-number: QTBUG-24184 Change-Id: I27420583a718a5f8cd93b9d361b1e422a75df300 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/windows/qwindowsclipboard.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/platforms/windows/qwindowsclipboard.cpp b/src/plugins/platforms/windows/qwindowsclipboard.cpp
index c1167ccf3a..4f083e93d2 100644
--- a/src/plugins/platforms/windows/qwindowsclipboard.cpp
+++ b/src/plugins/platforms/windows/qwindowsclipboard.cpp
@@ -283,14 +283,17 @@ bool QWindowsClipboard::clipboardViewerWndProc(HWND hwnd, UINT message, WPARAM w
}
}
return true;
- case WM_DRAWCLIPBOARD:
+ case WM_DRAWCLIPBOARD: {
+ const bool owned = ownsClipboard();
if (QWindowsContext::verboseOLE)
- qDebug("Clipboard changed");
- emitChanged(QClipboard::Clipboard);
+ qDebug("Clipboard changed owned %d", owned);
+ if (!owned) // changed is emitted by QClipboard in that case.
+ emitChanged(QClipboard::Clipboard);
// clean up the clipboard object if we no longer own the clipboard
- if (!ownsClipboard() && m_data)
+ if (!owned && m_data)
releaseIData();
propagateClipboardMessage(message, wParam, lParam);
+ }
return true;
case WM_DESTROY:
// Recommended shutdown