summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa/qcocoaintegration.mm
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@digia.com>2014-02-24 16:07:40 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-06 20:48:59 +0100
commit73adb7892634d8be69f475750337a3adce9cf002 (patch)
tree484915ce991ede57edb5c187f5bd4b46056ad90b /src/plugins/platforms/cocoa/qcocoaintegration.mm
parentb2216bbe06b8be2bef6d8bc2ffff1337f6d23358 (diff)
Cocoa: create QCocoaMimeTypes for Cocoa-only mime-types
Prepare to move qmacmime out of the cocoa port and into QPlatformSupport for sharing with iOS. This patch will start by moving tiff out, since it depends too much on old carbon image manipulation code that will not compile on iOS (depends on ApplicationServices etc). Change-Id: Id7a9b919c8f51fa9beb2f4ee2f13cca96894f6a6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.mm')
-rw-r--r--src/plugins/platforms/cocoa/qcocoaintegration.mm2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index dff7c9bd50..9a53e660f5 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -53,6 +53,7 @@
#include "qcocoatheme.h"
#include "qcocoainputcontext.h"
#include "qmacmime.h"
+#include "qcocoamimetypes.h"
#include "qcocoaaccessibility.h"
#include <qpa/qplatformaccessibility.h>
@@ -274,6 +275,7 @@ QCocoaIntegration::QCocoaIntegration()
updateScreens();
QMacInternalPasteboardMime::initializeMimeTypes();
+ QCocoaMimeTypes::initializeMimeTypes();
}
QCocoaIntegration::~QCocoaIntegration()