diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-28 13:01:55 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-28 13:01:55 (GMT) |
| commit | 7a69207653d97037d76b3dedfa3fa67033962eb3 (patch) | |
| tree | 0be4650fc332d9c5197dac3877567cb23504db77 /src/gui/kernel/qmime_mac.cpp | |
| parent | 9725ab222ffceb34b93af01631b273404ab784a9 (diff) | |
| parent | 406f13e53ad78ba65b15ee7f06787e1d8a5d3fdd (diff) | |
| download | Qt-7a69207653d97037d76b3dedfa3fa67033962eb3.zip Qt-7a69207653d97037d76b3dedfa3fa67033962eb3.tar.gz Qt-7a69207653d97037d76b3dedfa3fa67033962eb3.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/kernel/qmime_mac.cpp')
| -rw-r--r-- | src/gui/kernel/qmime_mac.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/gui/kernel/qmime_mac.cpp b/src/gui/kernel/qmime_mac.cpp index 9e8de67..2e9514d 100644 --- a/src/gui/kernel/qmime_mac.cpp +++ b/src/gui/kernel/qmime_mac.cpp @@ -68,6 +68,12 @@ #include "qmap.h" #include <private/qt_mac_p.h> + +#ifdef Q_WS_MAC32 +#include <QuickTime/QuickTime.h> +#include <qlibrary.h> +#endif + QT_BEGIN_NAMESPACE extern CGImageRef qt_mac_createCGImageFromQImage(const QImage &img, const QImage **imagePtr = 0); // qpaintengine_mac.cpp @@ -503,9 +509,6 @@ QList<QByteArray> QMacPasteboardMimeHTMLText::convertFromMime(const QString &mim // This can be removed once 10.6 is the minimum (or we have to require 64-bit) whichever comes first. -#include <QuickTime/QuickTime.h> -#include <qlibrary.h> - typedef ComponentResult (*PtrGraphicsImportSetDataHandle)(GraphicsImportComponent, Handle); typedef ComponentResult (*PtrGraphicsImportCreateCGImage)(GraphicsImportComponent, CGImageRef*, UInt32); typedef ComponentResult (*PtrGraphicsExportSetInputCGImage)(GraphicsExportComponent, CGImageRef); @@ -636,7 +639,9 @@ QList<QByteArray> QMacPasteboardMimePict::convertFromMime(const QString &mime, Q DisposeHandle(pic); return ret; } -#endif + + +#endif //Q_WS_MAC32 class QMacPasteboardMimeTiff : public QMacPasteboardMime { public: |