diff options
| author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-11 14:01:35 -0700 |
|---|---|---|
| committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-23 16:19:05 +0200 |
| commit | 48fe6dfaf0a52e8a0463fe3fd23015ea63d9d65a (patch) | |
| tree | 335822e20cda6614f0cbc5c4fb21c369146a1ad3 /src/gui/image/qicon.cpp | |
| parent | 9205078f3b2d842735599fd74d6324a4d84bc275 (diff) | |
More culling of Panther Code.
Removed lots of places where we check for Tiger. Now we can assume it.
Reviewed-by: Morten Sørvig
Diffstat (limited to 'src/gui/image/qicon.cpp')
| -rw-r--r-- | src/gui/image/qicon.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index edae29abd8..fa407c78ad 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -54,7 +54,7 @@ #ifdef Q_WS_MAC #include <private/qt_mac_p.h> -#include <Carbon/Carbon.h> +#include <private/qt_cocoa_helpers_mac_p.h> #endif QT_BEGIN_NAMESPACE @@ -178,8 +178,8 @@ QPixmapIconEngine::~QPixmapIconEngine() void QPixmapIconEngine::paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) { QSize pixmapSize = rect.size(); -#if defined(Q_WS_MAC) && !defined(Q_WS_MAC64) - pixmapSize *= (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_4) ? HIGetScaleFactor() : 1; +#if defined(Q_WS_MAC) + pixmapSize *= qt_mac_get_scalefactor(); #endif painter->drawPixmap(rect, pixmap(pixmapSize, mode, state)); } |