diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-11 01:00:10 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-12-11 14:50:53 +0100 |
| commit | a4a7c1bcf7595e2645c570d9c824532acf524fdf (patch) | |
| tree | c57de9a148d02529836e74c50e308a7ac50d8550 /src/plugins/platforms/cocoa/qcocoaclipboard.mm | |
| parent | bef74b6c3a0a9c8649ea8eb333d80015f76863e4 (diff) | |
| parent | e6de661a8aa96b5905ea7ba4cd5d76bd06da3f93 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
Change-Id: I6b82507bf9a80a374c40393e72f4843f1557de89
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaclipboard.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaclipboard.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaclipboard.mm b/src/plugins/platforms/cocoa/qcocoaclipboard.mm index a35c153084..141940cc50 100644 --- a/src/plugins/platforms/cocoa/qcocoaclipboard.mm +++ b/src/plugins/platforms/cocoa/qcocoaclipboard.mm @@ -67,7 +67,7 @@ void QCocoaClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode) } pasteBoard->sync(); - pasteBoard->setMimeData(data); + pasteBoard->setMimeData(data, QMacPasteboard::LazyRequest); emitChanged(mode); } } |