diff options
author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-03-12 12:07:51 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-15 11:40:50 +0100 |
commit | 99b8b647e3623325a8bfe39bea66c71c5467cdbc (patch) | |
tree | 1007876b6ed26c1d45794d70bf42ef72eee56cac /src/plugins/platforms/cocoa/qmacmime.h | |
parent | 65a2613e3e4fd341c2be35cb4eaf03d0918c2661 (diff) |
Implement cocoa clipboard support.
Add QCoccoaClipboard which wraps the existing
QMacPasteboard implementation. Remove unused
QClipboard integration code from qmacclipboard.mm
Change mime type cleanup from using qAddPostRoutine
to using an explicit call to destroyMimieTypes in
the cocoa platform integration destructor. This is
necessary to ensure cleanup happens in the correct
order on app shutdown.
Change-Id: Ief0e0d996b04c8e84e9fd2cd3a17fb5bd73bb761
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qmacmime.h')
-rw-r--r-- | src/plugins/platforms/cocoa/qmacmime.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qmacmime.h b/src/plugins/platforms/cocoa/qmacmime.h index 842caa5f2f..7226caef28 100644 --- a/src/plugins/platforms/cocoa/qmacmime.h +++ b/src/plugins/platforms/cocoa/qmacmime.h @@ -58,7 +58,8 @@ public: explicit QMacPasteboardMime(char); virtual ~QMacPasteboardMime(); - static void initialize(); + static void initializeMimeTypes(); + static void destroyMimeTypes(); static QList<QMacPasteboardMime*> all(uchar); static QMacPasteboardMime *convertor(uchar, const QString &mime, QString flav); |