diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-08-28 05:56:42 (GMT) |
|---|---|---|
| committer | Morten Sørvig <msorvig@trolltech.com> | 2009-08-28 05:56:42 (GMT) |
| commit | 1e982527668ea168f12875fda4ecc56ae017d7b3 (patch) | |
| tree | eddcebda5333d54cda0acdaa3f15086b441a5df1 /src/gui/kernel/qmime_mac.cpp | |
| parent | bc1b2e0528265841be8c4af912a665a92ce5906d (diff) | |
| download | Qt-1e982527668ea168f12875fda4ecc56ae017d7b3.zip Qt-1e982527668ea168f12875fda4ecc56ae017d7b3.tar.gz Qt-1e982527668ea168f12875fda4ecc56ae017d7b3.tar.bz2 | |
Compile with Qt-in-a-namepsace.
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: |