diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-28 06:11:31 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-28 13:20:23 +0200 |
commit | 2405aa9d6797dcfb2e47f45f113ee1ebbc201dda (patch) | |
tree | ea2b49501545cc98d63304b2751c2840bcf1dffd /src/plugins/platforms/windows/qwindowsinternalmimedata.cpp | |
parent | 904eaec9de3ed9efd446f2ef83c15055d2b2a871 (diff) |
Windows QPA: Move mime-type related classes to the new interface
Move QWindowsMime (which was a public class in Qt 4 and moved to the QPA
plugin in Qt 5) to the platform namespace and add register functions to the
native application.
Move in test code from QtWinExtras.
Task-number: QTBUG-83252
Change-Id: Iaac440e2d5cb370110919921b1eeb779600b5b65
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsinternalmimedata.cpp')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsinternalmimedata.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp b/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp index ad3f02f83b..21f64f04b6 100644 --- a/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp +++ b/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp @@ -41,6 +41,8 @@ #include "qwindowscontext.h" #include "qwindowsmime.h" #include <QtCore/qdebug.h> +#include <QtCore/qvariant.h> + /*! \class QWindowsInternalMimeDataBase \brief Base for implementations of QInternalMimeData using a IDataObject COM object. @@ -97,7 +99,7 @@ QVariant QWindowsInternalMimeData::retrieveData_sys(const QString &mimeType, QVariant result; const QWindowsMimeConverter &mc = QWindowsContext::instance()->mimeConverter(); - if (const QWindowsMime *converter = mc.converterToMime(mimeType, pDataObj)) + if (auto converter = mc.converterToMime(mimeType, pDataObj)) result = converter->convertToMime(mimeType, pDataObj, type); releaseDataObject(pDataObj); if (QWindowsContext::verbose) { |