path: root/src/gui/doc/src/dnd.qdoc
diff options
authorLiang Qi <>2016-08-13 01:05:02 +0200
committerLiang Qi <>2016-08-13 01:05:02 +0200
commit6b8f422c5e56b95aad298e1b984fb60fba1da282 (patch)
tree545dac994ef985cc91d92fa77da21581b6762c86 /src/gui/doc/src/dnd.qdoc
parentd04982dc84d66bec92b4b3767538676cf925ef17 (diff)
parentd9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
Diffstat (limited to 'src/gui/doc/src/dnd.qdoc')
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/doc/src/dnd.qdoc b/src/gui/doc/src/dnd.qdoc
index 1238480be8..03b3cbfa24 100644
--- a/src/gui/doc/src/dnd.qdoc
+++ b/src/gui/doc/src/dnd.qdoc
@@ -399,7 +399,7 @@
On X11, the public \l{}{XDND
protocol} is used, while on Windows Qt uses the OLE standard, and
- Qt for OS X uses the Cocoa Drag Manager. On X11, XDND uses MIME,
+ Qt for \macos uses the Cocoa Drag Manager. On X11, XDND uses MIME,
so no translation is necessary. The Qt API is the same regardless of
the platform. On Windows, MIME-aware applications can communicate by
using clipboard format names that are MIME types. Already some
@@ -408,6 +408,6 @@
Custom classes for translating proprietary clipboard formats can be
registered by reimplementing QWinMime on Windows or
- QMacPasteboardMime on OS X.
+ QMacPasteboardMime on \macos.