From a8a6728a3f3f21d0e931800ff434e3d9ff654fb0 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 17 Jun 2014 10:01:59 +0200 Subject: [PATCH] Fix references to platform-specific handlers in QMimeData documentation. Task-number: QTBUG-39558 Task-number: QTBUG-39559 Change-Id: I2634c5ac16f19251628228c9d60011a355846a79 Reviewed-by: Joerg Bornemann --- src/corelib/kernel/qmimedata.cpp | 2 +- src/gui/doc/src/dnd.qdoc | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp index 5d2adb0561e..3f2cd5a36a9 100644 --- a/src/corelib/kernel/qmimedata.cpp +++ b/src/corelib/kernel/qmimedata.cpp @@ -294,7 +294,7 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QVariant::Ty data is encoded. On Windows, the MIME format does not always map directly to the - clipboard formats. Qt provides QWindowsMime to map clipboard + clipboard formats. Qt provides QWinMime to map clipboard formats to open-standard MIME formats. Similarly, the QMacPasteboardMime maps MIME to Mac flavors. diff --git a/src/gui/doc/src/dnd.qdoc b/src/gui/doc/src/dnd.qdoc index 9f7fdc7fbf2..844848c76c6 100644 --- a/src/gui/doc/src/dnd.qdoc +++ b/src/gui/doc/src/dnd.qdoc @@ -399,13 +399,15 @@ On X11, the public \l{http://www.newplanetsoftware.com/xdnd/}{XDND protocol} is used, while on Windows Qt uses the OLE standard, and - Qt for Mac OS X uses the Cocoa Drag Manager. On X11, XDND uses MIME, + Qt for OS X 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 Windows applications use MIME naming conventions for their - clipboard formats. Internally, Qt uses QWindowsMime and - QMacPasteboardMime for translating proprietary clipboard formats - to and from MIME types. + clipboard formats. + + Custom classes for translating proprietary clipboard formats can be + registered by reimplementing QWinMime on Windows or + QMacPasteboardMime on OS X. */