From 0c1be3042e27bf1980afa14eb6b0990b78bdd15f Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Thu, 25 Jun 2009 11:24:09 +0200 Subject: Only instantiate the PICT pasteboard MIME when we have to. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 10.6 does a lot of image synthesis for us when we put up a tiff, which is great because we don't have to do a thing and it will work with all the applications out there. This means we don't need our PICT convertor on 10.6 for 32-bit apps. However, this magic doesn't exist in earlier versions of Mac OS X, so we have to keep it around (along with the QuickTime symbol resolving) there. Reviewed-by: Morten Sørvig --- src/gui/kernel/qmime_mac.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qmime_mac.cpp b/src/gui/kernel/qmime_mac.cpp index 31c66e4..903b677 100644 --- a/src/gui/kernel/qmime_mac.cpp +++ b/src/gui/kernel/qmime_mac.cpp @@ -502,6 +502,8 @@ QList QMacPasteboardMimeHTMLText::convertFromMime(const QString &mim #ifdef Q_WS_MAC32 +// This can be removed once 10.6 is the minimum (or we have to require 64-bit) whichever comes first. + #include #include @@ -1099,7 +1101,10 @@ void QMacPasteboardMime::initialize() //standard types that we wrap new QMacPasteboardMimeTiff; #ifdef Q_WS_MAC32 - new QMacPasteboardMimePict; + // 10.6 does automatic synthesis to and from PICT to standard image types (like TIFF), + // so don't bother doing it ourselves, especially since it's not available in 64-bit. + if (QSysInfo::MacintoshVersion < QSysInfo::MV_10_6) + new QMacPasteboardMimePict; #endif new QMacPasteboardMimeUnicodeText; new QMacPasteboardMimePlainText; -- cgit v0.12