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/qcocoanativeinterface.h | |
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/qcocoanativeinterface.h')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoanativeinterface.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h index 2fa9d7ebe4..825f88a269 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h @@ -59,6 +59,8 @@ public: void *nativeResourceForContext(const QByteArray &resourceString, QOpenGLContext *context); void *nativeResourceForWindow(const QByteArray &resourceString, QWindow *window); + NativeResourceForIntegrationFunction nativeResourceFunctionForIntegration(const QByteArray &resource) Q_DECL_OVERRIDE; + static void *cglContextForContext(QOpenGLContext *context); static void *nsOpenGLContextForContext(QOpenGLContext* context); @@ -83,6 +85,13 @@ private: Needed by the native print dialog in the QtPrintSupport library. */ Q_INVOKABLE void *NSPrintInfoForPrintEngine(QPrintEngine *printEngine); + + // QMacPastebardMime support. The mac pasteboard void pointers are + // QMacPastebardMime instances from the cocoa plugin or qtmacextras + // These two classes are kept in sync and can be casted between. + static void addToMimeList(void *macPasteboardMime); + static void removeFromMimeList(void *macPasteboardMime); + static void registerDraggedTypes(const QStringList &types); }; #endif // QCOCOANATIVEINTERFACE_H |