Reintroduce converter APIs for supporting native clipboard formats

In Qt 5, QWin(dows)Mime and QMacMime lived in the respective Extras
modules, which were removed and partially folded into the relevant
modules in Qt. QWindowsMime and QMacMime continued to provide the
abstraction for implementing built-in support for native clipboard
formats and UTIs within Qt, but only as private APIs.

After the recent clean up of those APIs and respective infrastructure,
we can now bring them back as public converter interfaces. Application
developers can subclass those and instantiate an instance of their
implementation to add support for platform or application specific
data formats.

These interfaces are not in the QNativeInterface namespace, as
applications don't call into Windows or macOS using those interfaces.
I.e. there is no class on which an application would call

  auto *converter= nativeInterface<QWindowsMimeConverter>();

Also, since applications override those converter types, we do want to
guarantee binary and source compatibility.

[ChangeLog][QtGui][QWindowsMimeConverter] Reintroduced to allow
applications to add support for conversion from and to Windows-native
clipboard formats to MIME-encoded data.

[ChangeLog][QtGui][QUtiMimeConverter] Reintroduced to allow
applications to add support for conversion from and to clipboard data on
macOS and iOS to MIME-encoded data.

Fixes: QTBUG-93632
Change-Id: Iebd909c3970015d203f59d5ab15e306b3d312f6e
Reviewed-by: Yuhang Zhao <2546789017@qq.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

12 files changed, 66 insertions, 66 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaclipboard.mm b/src/plugins/platforms/cocoa/qcocoaclipboard.mm
index b73dec63cc..0c8da26137 100644
--- a/src/plugins/platforms/cocoa/qcocoaclipboard.mm
+++ b/src/plugins/platforms/cocoa/qcocoaclipboard.mm
@@ -3,15 +3,15 @@
 
 #include "qcocoaclipboard.h"
 
-#include <QtGui/private/qmacmime_p.h>
+#include <QtGui/qutimimeconverter.h>
 
 #ifndef QT_NO_CLIPBOARD
 
 QT_BEGIN_NAMESPACE
 
 QCocoaClipboard::QCocoaClipboard()
-    :m_clipboard(new QMacPasteboard(kPasteboardClipboard, QMacMime::HandlerScope::Clipboard))
-    ,m_find(new QMacPasteboard(kPasteboardFind, QMacMime::HandlerScope::Clipboard))
+    :m_clipboard(new QMacPasteboard(kPasteboardClipboard, QUtiMimeConverter::HandlerScope::Clipboard))
+    ,m_find(new QMacPasteboard(kPasteboardFind, QUtiMimeConverter::HandlerScope::Clipboard))
 {
     connect(qGuiApp, &QGuiApplication::applicationStateChanged, this, &QCocoaClipboard::handleApplicationStateChanged);
 }
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
index b011c05606..ec46dda38a 100644
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
@@ -7,7 +7,7 @@
 #include "qmacclipboard.h"
 #include "qcocoahelpers.h"
 #include <QtGui/private/qcoregraphics_p.h>
-#include <QtGui/private/qmacmime_p.h>
+#include <QtGui/qutimimeconverter.h>
 #include <QtCore/qsysinfo.h>
 #include <QtCore/private/qcore_mac_p.h>
 
@@ -98,7 +98,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
     m_drag = o;
     m_executed_drop_action = Qt::IgnoreAction;
 
-    QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacMime::HandlerScope::DnD);
+    QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QUtiMimeConverter::HandlerScope::DnD);
     m_drag->mimeData()->setData("application/x-qt-mime-type-name"_L1, QByteArray("dummy"));
     dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
 
@@ -305,7 +305,7 @@ QStringList QCocoaDropData::formats_sys() const
         qDebug("DnD: Cannot get PasteBoard!");
         return formats;
     }
-    formats = QMacPasteboard(board, QMacMime::HandlerScope::DnD).formats();
+    formats = QMacPasteboard(board, QUtiMimeConverter::HandlerScope::DnD).formats();
     return formats;
 }
 
@@ -317,7 +317,7 @@ QVariant QCocoaDropData::retrieveData_sys(const QString &mimeType, QMetaType) co
         qDebug("DnD: Cannot get PasteBoard!");
         return data;
     }
-    data = QMacPasteboard(board, QMacMime::HandlerScope::DnD).retrieveData(mimeType);
+    data = QMacPasteboard(board, QUtiMimeConverter::HandlerScope::DnD).retrieveData(mimeType);
     CFRelease(board);
     return data;
 }
@@ -330,7 +330,7 @@ bool QCocoaDropData::hasFormat_sys(const QString &mimeType) const
         qDebug("DnD: Cannot get PasteBoard!");
         return has;
     }
-    has = QMacPasteboard(board, QMacMime::HandlerScope::DnD).hasFormat(mimeType);
+    has = QMacPasteboard(board, QUtiMimeConverter::HandlerScope::DnD).hasFormat(mimeType);
     CFRelease(board);
     return has;
 }
diff --git a/src/plugins/platforms/cocoa/qcocoamimetypes.mm b/src/plugins/platforms/cocoa/qcocoamimetypes.mm
index 6491557d48..52e5c64538 100644
--- a/src/plugins/platforms/cocoa/qcocoamimetypes.mm
+++ b/src/plugins/platforms/cocoa/qcocoamimetypes.mm
@@ -4,7 +4,7 @@
 #include <AppKit/AppKit.h>
 
 #include "qcocoamimetypes.h"
-#include <QtGui/private/qmacmime_p.h>
+#include <QtGui/qutimimeconverter.h>
 #include "qcocoahelpers.h"
 #include <QtGui/private/qcoregraphics_p.h>
 
@@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-class QMacMimeTraditionalMacPlainText : public QMacMime {
+class QMacMimeTraditionalMacPlainText : public QUtiMimeConverter {
 public:
     QString utiForMime(const QString &mime) const override;
     QString mimeForUti(const QString &uti) const override;
diff --git a/src/plugins/platforms/cocoa/qmacclipboard.h b/src/plugins/platforms/cocoa/qmacclipboard.h
index f2a90b1347..030732446f 100644
--- a/src/plugins/platforms/cocoa/qmacclipboard.h
+++ b/src/plugins/platforms/cocoa/qmacclipboard.h
@@ -5,13 +5,13 @@
 #define QMACCLIPBOARD_H
 
 #include <QtGui>
-#include <QtGui/private/qmacmime_p.h>
+#include <QtGui/qutimimeconverter.h>
 
 #include <ApplicationServices/ApplicationServices.h>
 
 QT_BEGIN_NAMESPACE
 
-class QMacMime;
+class QUtiMimeConverter;
 
 class QMacPasteboard
 {
@@ -21,12 +21,12 @@ private:
     struct Promise {
         Promise() : itemId(0), converter(nullptr) { }
 
-        static Promise eagerPromise(int itemId, const QMacMime *c, const QString &m, QMimeData *d, int o = 0);
-        static Promise lazyPromise(int itemId, const QMacMime *c, const QString &m, QMimeData *d, int o = 0);
-        Promise(int itemId, const QMacMime *c, const QString &m, QMimeData *md, int o, DataRequestType drt);
+        static Promise eagerPromise(int itemId, const QUtiMimeConverter *c, const QString &m, QMimeData *d, int o = 0);
+        static Promise lazyPromise(int itemId, const QUtiMimeConverter *c, const QString &m, QMimeData *d, int o = 0);
+        Promise(int itemId, const QUtiMimeConverter *c, const QString &m, QMimeData *md, int o, DataRequestType drt);
 
         int itemId, offset;
-        const QMacMime *converter;
+        const QUtiMimeConverter *converter;
         QString mime;
         QPointer<QMimeData> mimeData;
         QVariant variantData;
@@ -41,16 +41,16 @@ private:
     QList<Promise> promises;
 
     PasteboardRef paste;
-    const QMacMime::HandlerScope scope;
+    const QUtiMimeConverter::HandlerScope scope;
     mutable QPointer<QMimeData> mime;
     mutable bool mac_mime_source;
     bool resolvingBeforeDestruction;
     static OSStatus promiseKeeper(PasteboardRef, PasteboardItemID, CFStringRef, void *);
     void clear_helper();
 public:
-    QMacPasteboard(PasteboardRef p, QMacMime::HandlerScope scope = QMacMime::HandlerScope::All);
-    QMacPasteboard(QMacMime::HandlerScope scope);
-    QMacPasteboard(CFStringRef name=nullptr, QMacMime::HandlerScope scope = QMacMime::HandlerScope::All);
+    QMacPasteboard(PasteboardRef p, QUtiMimeConverter::HandlerScope scope = QUtiMimeConverter::HandlerScope::All);
+    QMacPasteboard(QUtiMimeConverter::HandlerScope scope);
+    QMacPasteboard(CFStringRef name=nullptr, QUtiMimeConverter::HandlerScope scope = QUtiMimeConverter::HandlerScope::All);
     ~QMacPasteboard();
 
     bool hasUti(const QString &uti) const;
diff --git a/src/plugins/platforms/cocoa/qmacclipboard.mm b/src/plugins/platforms/cocoa/qmacclipboard.mm
index 48b440923a..3a39fdfb0f 100644
--- a/src/plugins/platforms/cocoa/qmacclipboard.mm
+++ b/src/plugins/platforms/cocoa/qmacclipboard.mm
@@ -5,7 +5,7 @@
 
 #include "qmacclipboard.h"
 #include <QtGui/private/qmacmimeregistry_p.h>
-#include <QtGui/private/qmacmime_p.h>
+#include <QtGui/qutimimeconverter.h>
 #include <QtGui/qclipboard.h>
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qbitmap.h>
@@ -54,7 +54,7 @@ private:
     QMacMimeData();
 };
 
-QMacPasteboard::Promise::Promise(int itemId, const QMacMime *c, const QString &m, QMimeData *md, int o, DataRequestType drt)
+QMacPasteboard::Promise::Promise(int itemId, const QUtiMimeConverter *c, const QString &m, QMimeData *md, int o, DataRequestType drt)
     : itemId(itemId), offset(o), converter(c), mime(m), dataRequestType(drt)
 {
     // Request the data from the application immediately for eager requests.
@@ -69,7 +69,7 @@ QMacPasteboard::Promise::Promise(int itemId, const QMacMime *c, const QString &m
     }
 }
 
-QMacPasteboard::QMacPasteboard(PasteboardRef p, QMacMime::HandlerScope scope)
+QMacPasteboard::QMacPasteboard(PasteboardRef p, QUtiMimeConverter::HandlerScope scope)
     : scope(scope)
 {
     mac_mime_source = false;
@@ -78,7 +78,7 @@ QMacPasteboard::QMacPasteboard(PasteboardRef p, QMacMime::HandlerScope scope)
     resolvingBeforeDestruction = false;
 }
 
-QMacPasteboard::QMacPasteboard(QMacMime::HandlerScope scope)
+QMacPasteboard::QMacPasteboard(QUtiMimeConverter::HandlerScope scope)
     : scope(scope)
 {
     mac_mime_source = false;
@@ -91,7 +91,7 @@ QMacPasteboard::QMacPasteboard(QMacMime::HandlerScope scope)
     resolvingBeforeDestruction = false;
 }
 
-QMacPasteboard::QMacPasteboard(CFStringRef name, QMacMime::HandlerScope scope)
+QMacPasteboard::QMacPasteboard(CFStringRef name, QUtiMimeConverter::HandlerScope scope)
     : scope(scope)
 {
     mac_mime_source = false;
@@ -111,7 +111,7 @@ QMacPasteboard::~QMacPasteboard()
         Commit all promises for paste when shutting down,
         unless we are the stack-allocated clipboard used by QCocoaDrag.
     */
-    if (scope == QMacMime::HandlerScope::DnD)
+    if (scope == QUtiMimeConverter::HandlerScope::DnD)
         resolvingBeforeDestruction = true;
     PasteboardResolvePromises(paste);
     if (paste)
@@ -130,16 +130,16 @@ OSStatus QMacPasteboard::promiseKeeper(PasteboardRef paste, PasteboardItemID id,
     const long promise_id = (long)id;
 
     // Find the kept promise
-    const QList<QMacMime*> availableConverters = QMacMimeRegistry::all(QMacMime::HandlerScope::All);
+    const QList<QUtiMimeConverter*> availableConverters = QMacMimeRegistry::all(QUtiMimeConverter::HandlerScope::All);
     const QString utiAsQString = QString::fromCFString(uti);
     QMacPasteboard::Promise promise;
     for (int i = 0; i < qpaste->promises.size(); i++){
         const QMacPasteboard::Promise tmp = qpaste->promises[i];
         if (!availableConverters.contains(tmp.converter)) {
             // promise.converter is a pointer initialized by the value found
-            // in QMacMime's global list of QMacMimes.
-            // We add pointers to this list in QMacMime's ctor;
-            // we remove these pointers in QMacMime's dtor.
+            // in QUtiMimeConverter's global list of QMacMimes.
+            // We add pointers to this list in QUtiMimeConverter's ctor;
+            // we remove these pointers in QUtiMimeConverter's dtor.
             // If tmp.converter was not found in this list, we probably have a
             // dangling pointer so let's skip it.
             continue;
@@ -258,7 +258,7 @@ void QMacPasteboard::setMimeData(QMimeData *mime_src, DataRequestType dataReques
     delete mime;
     mime = mime_src;
 
-    const QList<QMacMime*> availableConverters = QMacMimeRegistry::all(scope);
+    const QList<QUtiMimeConverter*> availableConverters = QMacMimeRegistry::all(scope);
     if (mime != nullptr) {
         clear_helper();
         QStringList formats = mime_src->formats();
@@ -386,7 +386,7 @@ QVariant QMacPasteboard::retrieveData(const QString &format) const
         return QByteArray();
 
     qCDebug(lcQpaClipboard, "Pasteboard: retrieveData [%s]", qPrintable(format));
-    const QList<QMacMime *> availableConverters = QMacMimeRegistry::all(scope);
+    const QList<QUtiMimeConverter *> availableConverters = QMacMimeRegistry::all(scope);
     for (const auto *c : availableConverters) {
         const QString c_uti = c->utiForMime(format);
         if (!c_uti.isEmpty()) {
diff --git a/src/plugins/platforms/ios/qiosclipboard.mm b/src/plugins/platforms/ios/qiosclipboard.mm
index f360e4e41c..7e1e4aa0d4 100644
--- a/src/plugins/platforms/ios/qiosclipboard.mm
+++ b/src/plugins/platforms/ios/qiosclipboard.mm
@@ -7,7 +7,7 @@
 
 #include <QtCore/qurl.h>
 #include <QtGui/private/qmacmimeregistry_p.h>
-#include <QtGui/private/qmacmime_p.h>
+#include <QtGui/qutimimeconverter.h>
 #include <QtCore/QMimeData>
 #include <QtGui/QGuiApplication>
 
@@ -117,7 +117,7 @@ QStringList QIOSMimeData::formats() const
 
     for (NSUInteger i = 0; i < [pasteboardTypes count]; ++i) {
         const QString uti = QString::fromNSString([pasteboardTypes objectAtIndex:i]);
-        const QString mimeType = QMacMimeRegistry::flavorToMime(QMacMime::HandlerScope::All, uti);
+        const QString mimeType = QMacMimeRegistry::flavorToMime(QUtiMimeConverter::HandlerScope::All, uti);
         if (!mimeType.isEmpty() && !foundMimeTypes.contains(mimeType))
             foundMimeTypes << mimeType;
     }
@@ -130,8 +130,8 @@ QVariant QIOSMimeData::retrieveData(const QString &mimeType, QMetaType) const
     UIPasteboard *pb = [UIPasteboard pasteboardWithQClipboardMode:m_mode];
     NSArray<NSString *> *pasteboardTypes = [pb pasteboardTypes];
 
-    const auto converters = QMacMimeRegistry::all(QMacMime::HandlerScope::All);
-    for (QMacMime *converter : converters) {
+    const auto converters = QMacMimeRegistry::all(QUtiMimeConverter::HandlerScope::All);
+    for (QUtiMimeConverter *converter : converters) {
         for (NSUInteger i = 0; i < [pasteboardTypes count]; ++i) {
             NSString *availableUtiNSString = [pasteboardTypes objectAtIndex:i];
             const QString availableUti = QString::fromNSString(availableUtiNSString);
@@ -183,8 +183,8 @@ void QIOSClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
 
     const auto formats = mimeData->formats();
     for (const QString &mimeType : formats) {
-        const auto converters = QMacMimeRegistry::all(QMacMime::HandlerScope::All);
-        for (const QMacMime *converter : converters) {
+        const auto converters = QMacMimeRegistry::all(QUtiMimeConverter::HandlerScope::All);
+        for (const QUtiMimeConverter *converter : converters) {
             const QString uti = converter->utiForMime(mimeType);
             if (uti.isEmpty())
                 continue;
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
index c4c3942d2c..cb8eba651d 100644
--- a/src/plugins/platforms/ios/qiosintegration.mm
+++ b/src/plugins/platforms/ios/qiosintegration.mm
@@ -25,7 +25,7 @@
 
 #include <QtGui/private/qcoretextfontdatabase_p.h>
 #include <QtGui/private/qmacmimeregistry_p.h>
-#include <QtGui/private/qmacmime_p.h>
+#include <QtGui/qutimimeconverter.h>
 #include <QDir>
 #include <QOperatingSystemVersion>
 
diff --git a/src/plugins/platforms/windows/qwindowsapplication.cpp b/src/plugins/platforms/windows/qwindowsapplication.cpp
index 1392311ed2..f0bce35336 100644
--- a/src/plugins/platforms/windows/qwindowsapplication.cpp
+++ b/src/plugins/platforms/windows/qwindowsapplication.cpp
@@ -82,13 +82,13 @@ void QWindowsApplication::setDarkModeHandling(QWindowsApplication::DarkModeHandl
     m_darkModeHandling = handling;
 }
 
-void QWindowsApplication::registerMime(QNativeInterface::Private::QWindowsMime *mime)
+void QWindowsApplication::registerMime(QWindowsMimeConverter *mime)
 {
     if (auto ctx = QWindowsContext::instance())
         ctx->mimeConverter().registerMime(mime);
 }
 
-void QWindowsApplication::unregisterMime(QNativeInterface::Private::QWindowsMime *mime)
+void QWindowsApplication::unregisterMime(QWindowsMimeConverter *mime)
 {
     if (auto ctx = QWindowsContext::instance())
         ctx->mimeConverter().unregisterMime(mime);
diff --git a/src/plugins/platforms/windows/qwindowsapplication.h b/src/plugins/platforms/windows/qwindowsapplication.h
index 167db0d46b..a969e3c867 100644
--- a/src/plugins/platforms/windows/qwindowsapplication.h
+++ b/src/plugins/platforms/windows/qwindowsapplication.h
@@ -28,8 +28,8 @@ public:
     DarkModeHandling darkModeHandling() const override;
     void setDarkModeHandling(DarkModeHandling handling) override;
 
-    void registerMime(QNativeInterface::Private::QWindowsMime *mime) override;
-    void unregisterMime(QNativeInterface::Private::QWindowsMime *mime) override;
+    void registerMime(QWindowsMimeConverter *mime) override;
+    void unregisterMime(QWindowsMimeConverter *mime) override;
 
     int registerMimeType(const QString &mime) override;
 
diff --git a/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp b/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp
index 5672034c8c..0542473a4b 100644
--- a/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp
+++ b/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp
@@ -22,9 +22,9 @@
 
     The base class introduces new virtuals to obtain and release
     the instances IDataObject from the clipboard or Drag and Drop and
-    does conversion using QWindowsMime classes.
+    does conversion using QWindowsMimeConverter classes.
 
-    \sa QInternalMimeData, QWindowsMime, QWindowsMimeRegistry
+    \sa QInternalMimeData, QWindowsMimeConverter, QWindowsMimeRegistry
     \internal
 */
 
diff --git a/src/plugins/platforms/windows/qwindowsmimeregistry.cpp b/src/plugins/platforms/windows/qwindowsmimeregistry.cpp
index 9ea36bd5ed..64b5dc463e 100644
--- a/src/plugins/platforms/windows/qwindowsmimeregistry.cpp
+++ b/src/plugins/platforms/windows/qwindowsmimeregistry.cpp
@@ -333,7 +333,7 @@ QDebug operator<<(QDebug d, IDataObject *dataObj)
 }
 #endif // !QT_NO_DEBUG_STREAM
 
-class QWindowsMimeText : public QNativeInterface::Private::QWindowsMime
+class QWindowsMimeText : public QWindowsMimeConverter
 {
 public:
     bool canConvertToMime(const QString &mimeType, IDataObject *pDataObj) const override;
@@ -489,7 +489,7 @@ QVariant QWindowsMimeText::convertToMime(const QString &mime, LPDATAOBJECT pData
     return ret;
 }
 
-class QWindowsMimeURI : public QNativeInterface::Private::QWindowsMime
+class QWindowsMimeURI : public QWindowsMimeConverter
 {
 public:
     QWindowsMimeURI();
@@ -655,7 +655,7 @@ QVariant QWindowsMimeURI::convertToMime(const QString &mimeType, LPDATAOBJECT pD
     return QVariant();
 }
 
-class QWindowsMimeHtml : public QNativeInterface::Private::QWindowsMime
+class QWindowsMimeHtml : public QWindowsMimeConverter
 {
 public:
     QWindowsMimeHtml();
@@ -793,7 +793,7 @@ bool QWindowsMimeHtml::convertFromMime(const FORMATETC &formatetc, const QMimeDa
 
 
 #ifndef QT_NO_IMAGEFORMAT_BMP
-class QWindowsMimeImage : public QNativeInterface::Private::QWindowsMime
+class QWindowsMimeImage : public QWindowsMimeConverter
 {
 public:
     QWindowsMimeImage();
@@ -953,7 +953,7 @@ QVariant QWindowsMimeImage::convertToMime(const QString &mimeType, IDataObject *
 }
 #endif
 
-class QBuiltInMimes : public QNativeInterface::Private::QWindowsMime
+class QBuiltInMimes : public QWindowsMimeConverter
 {
 public:
     QBuiltInMimes();
@@ -974,7 +974,7 @@ private:
 };
 
 QBuiltInMimes::QBuiltInMimes()
-: QWindowsMime()
+: QWindowsMimeConverter()
 {
     outFormats.insert(registerMimeType(u"application/x-color"_s), u"application/x-color"_s);
     inFormats.insert(registerMimeType(u"application/x-color"_s), u"application/x-color"_s);
@@ -1074,7 +1074,7 @@ QString QBuiltInMimes::mimeForFormat(const FORMATETC &formatetc) const
 }
 
 
-class QLastResortMimes : public QNativeInterface::Private::QWindowsMime
+class QLastResortMimes : public QWindowsMimeConverter
 {
 public:
 
@@ -1265,9 +1265,9 @@ QString QLastResortMimes::mimeForFormat(const FORMATETC &formatetc) const
 
 /*!
     \class QWindowsMimeRegistry
-    \brief Manages the list of QWindowsMime instances.
+    \brief Manages the list of QWindowsMimeConverter instances.
     \internal
-    \sa QWindowsMime
+    \sa QWindowsMimeConverter
 */
 
 QWindowsMimeRegistry::QWindowsMimeRegistry() = default;
@@ -1277,7 +1277,7 @@ QWindowsMimeRegistry::~QWindowsMimeRegistry()
     qDeleteAll(m_mimes.begin(), m_mimes.begin() + m_internalMimeCount);
 }
 
-QWindowsMimeRegistry::QWindowsMime *QWindowsMimeRegistry::converterToMime(const QString &mimeType, IDataObject *pDataObj) const
+QWindowsMimeRegistry::QWindowsMimeConverter *QWindowsMimeRegistry::converterToMime(const QString &mimeType, IDataObject *pDataObj) const
 {
     ensureInitialized();
     for (int i = m_mimes.size()-1; i >= 0; --i) {
@@ -1289,7 +1289,7 @@ QWindowsMimeRegistry::QWindowsMime *QWindowsMimeRegistry::converterToMime(const
 
 QStringList QWindowsMimeRegistry::allMimesForFormats(IDataObject *pDataObj) const
 {
-    qCDebug(lcQpaMime) << "QWindowsMime::allMimesForFormats()";
+    qCDebug(lcQpaMime) << "QWindowsMimeConverter::allMimesForFormats()";
     ensureInitialized();
     QStringList formats;
     LPENUMFORMATETC FAR fmtenum;
@@ -1316,7 +1316,7 @@ QStringList QWindowsMimeRegistry::allMimesForFormats(IDataObject *pDataObj) cons
     return formats;
 }
 
-QWindowsMimeRegistry::QWindowsMime *QWindowsMimeRegistry::converterFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const
+QWindowsMimeRegistry::QWindowsMimeConverter *QWindowsMimeRegistry::converterFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const
 {
     ensureInitialized();
     qCDebug(lcQpaMime) << __FUNCTION__ << formatetc;
@@ -1374,7 +1374,7 @@ QVariant QWindowsMimeRegistry::convertToMime(const QStringList &mimeTypes,
                                               QString *formatIn /* = 0 */) const
 {
     for (const QString &format : mimeTypes) {
-        if (const QWindowsMime *converter = converterToMime(format, pDataObj)) {
+        if (const QWindowsMimeConverter *converter = converterToMime(format, pDataObj)) {
             if (converter->canConvertToMime(format, pDataObj)) {
                 const QVariant dataV = converter->convertToMime(format, pDataObj, preferredType);
                 if (dataV.isValid()) {
@@ -1391,7 +1391,7 @@ QVariant QWindowsMimeRegistry::convertToMime(const QStringList &mimeTypes,
     return QVariant();
 }
 
-void QWindowsMimeRegistry::registerMime(QWindowsMime *mime)
+void QWindowsMimeRegistry::registerMime(QWindowsMimeConverter *mime)
 {
     ensureInitialized();
     m_mimes.append(mime);
diff --git a/src/plugins/platforms/windows/qwindowsmimeregistry.h b/src/plugins/platforms/windows/qwindowsmimeregistry.h
index 82a4b0fc34..a0f4b4c60a 100644
--- a/src/plugins/platforms/windows/qwindowsmimeregistry.h
+++ b/src/plugins/platforms/windows/qwindowsmimeregistry.h
@@ -4,10 +4,10 @@
 #ifndef QWINDOWSMIMEREGISTRY_H
 #define QWINDOWSMIMEREGISTRY_H
 
-#include <QtGui/private/qwindowsmime_p.h>
 
 #include <QtCore/qt_windows.h>
 
+#include <QtGui/qwindowsmimeconverter.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qvariant.h>
 
@@ -20,22 +20,22 @@ class QWindowsMimeRegistry
 {
     Q_DISABLE_COPY_MOVE(QWindowsMimeRegistry)
 public:
-    using QWindowsMime = QNativeInterface::Private::QWindowsMime;
+    using QWindowsMimeConverter = QWindowsMimeConverter;
 
     QWindowsMimeRegistry();
     ~QWindowsMimeRegistry();
 
-    QWindowsMime *converterToMime(const QString &mimeType, IDataObject *pDataObj) const;
+    QWindowsMimeConverter *converterToMime(const QString &mimeType, IDataObject *pDataObj) const;
     QStringList allMimesForFormats(IDataObject *pDataObj) const;
-    QWindowsMime *converterFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const;
+    QWindowsMimeConverter *converterFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const;
     QList<FORMATETC> allFormatsForMime(const QMimeData *mimeData) const;
 
     // Convenience.
     QVariant convertToMime(const QStringList &mimeTypes, IDataObject *pDataObj, QMetaType preferredType,
                            QString *format = nullptr) const;
 
-    void registerMime(QWindowsMime *mime);
-    void unregisterMime(QWindowsMime *mime) { m_mimes.removeOne(mime); }
+    void registerMime(QWindowsMimeConverter *mime);
+    void unregisterMime(QWindowsMimeConverter *mime) { m_mimes.removeOne(mime); }
 
     static int registerMimeType(const QString &mime);
 
@@ -44,7 +44,7 @@ public:
 private:
     void ensureInitialized() const;
 
-    mutable QList<QWindowsMime *> m_mimes;
+    mutable QList<QWindowsMimeConverter *> m_mimes;
     mutable int m_internalMimeCount = 0;
 };