diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-01-02 14:04:29 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-21 09:29:32 +0100 |
| commit | 3e8996df2a2016fd0f80cbe44e72f556964654ce (patch) | |
| tree | 92e2218a1f4b10d8a65280bcf5b67b5a7846f572 /src/plugins/platforms/cocoa/qmacmime.mm | |
| parent | f8c389bc3c8dc0a99d16bf566643744e9bfa2e91 (diff) | |
Export functions to add custom mime converters.
For use with public API in QtMacExtras.
This goes into Qt stable: Fix for new functionality,
and close a feature regression against Qt 4.
Change-Id: I555fdff3ddb39336ccd72f9711d465f1c18c6b45
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qmacmime.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qmacmime.mm | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/plugins/platforms/cocoa/qmacmime.mm b/src/plugins/platforms/cocoa/qmacmime.mm index ad898e1a3d..339559b6a6 100644 --- a/src/plugins/platforms/cocoa/qmacmime.mm +++ b/src/plugins/platforms/cocoa/qmacmime.mm @@ -66,6 +66,17 @@ typedef QList<QMacPasteboardMime*> MimeList; Q_GLOBAL_STATIC(MimeList, globalMimeList) Q_GLOBAL_STATIC(QStringList, globalDraggedTypesList) +void qt_mac_addToGlobalMimeList(QMacPasteboardMime *macMime) +{ + globalMimeList()->append(macMime); +} + +void qt_mac_removeFromGlobalMimeList(QMacPasteboardMime *macMime) +{ + if (!QGuiApplication::closingDown()) + globalMimeList()->removeAll(macMime); +} + /*! \fn void qRegisterDraggedTypes(const QStringList &types) \relates QMacPasteboardMime @@ -79,17 +90,16 @@ Q_GLOBAL_STATIC(QStringList, globalDraggedTypesList) \sa QMacPasteboardMime */ -Q_WIDGETS_EXPORT void qRegisterDraggedTypes(const QStringList &types) +void qt_mac_registerDraggedTypes(const QStringList &types) { (*globalDraggedTypesList()) += types; } -const QStringList& qEnabledDraggedTypes() +const QStringList& qt_mac_enabledDraggedTypes() { return (*globalDraggedTypesList()); } - /***************************************************************************** QDnD debug facilities *****************************************************************************/ @@ -155,7 +165,7 @@ CFStringRef qt_mac_mime_typeUTI = CFSTR("com.pasteboard.trolltech.marker"); */ QMacPasteboardMime::QMacPasteboardMime(char t) : type(t) { - globalMimeList()->append(this); + qt_mac_addToGlobalMimeList(this); } /*! @@ -164,8 +174,7 @@ QMacPasteboardMime::QMacPasteboardMime(char t) : type(t) */ QMacPasteboardMime::~QMacPasteboardMime() { - if (!QGuiApplication::closingDown()) - globalMimeList()->removeAll(this); + qt_mac_removeFromGlobalMimeList(this); } /*! |