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/qnsview.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/qnsview.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index 91cbf2a88e..715b0c367f 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -49,6 +49,7 @@ #include "qcocoaautoreleasepool.h" #include "qmultitouch_mac_p.h" #include "qcocoadrag.h" +#include "qmacmime.h" #include <qpa/qplatformintegration.h> #include <qpa/qwindowsysteminterface.h> @@ -1106,8 +1107,7 @@ static QTouchDevice *touchDevice = 0; -(void)registerDragTypes { QCocoaAutoReleasePool pool; - // ### Custom types disabled. - QStringList customTypes; // = qEnabledDraggedTypes(); + QStringList customTypes = qt_mac_enabledDraggedTypes(); if (currentCustomDragTypes == 0 || *currentCustomDragTypes != customTypes) { if (currentCustomDragTypes == 0) currentCustomDragTypes = new QStringList(); |