diff options
| author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-24 11:28:12 (GMT) |
|---|---|---|
| committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-24 11:28:12 (GMT) |
| commit | ed2a03b3bc85be056eca87928d18a746faa07bca (patch) | |
| tree | dbfd8d2874c12f3229537dac08ed454587cfa306 /src/gui/image/qpixmap.cpp | |
| parent | 5e157ed2fc5a3780959da0246ceb2b20fabbbeb5 (diff) | |
| download | Qt-ed2a03b3bc85be056eca87928d18a746faa07bca.zip Qt-ed2a03b3bc85be056eca87928d18a746faa07bca.tar.gz Qt-ed2a03b3bc85be056eca87928d18a746faa07bca.tar.bz2 | |
Remove all the last vestiges of QuickDraw in Qt/Mac.
Panther was the last reason for having this around. We don't touch this
code anywhere else in Qt. As a result it's orphaned and can be safely
removed. It truly is the end of an era, but it's definitely worth
celebrating. Quartz4Life!
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 3e5c9b7..18829f4 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -671,12 +671,7 @@ void QPixmap::resize_helper(const QSize &s) p.drawPixmap(0, 0, *this, 0, 0, qMin(width(), w), qMin(height(), h)); } -#if defined(Q_WS_MAC) -#ifndef QT_MAC_NO_QUICKDRAW - if(macData && macData->qd_alpha) - macData->macQDUpdateAlpha(); -#endif -#elif defined(Q_WS_X11) +#if defined(Q_WS_X11) if (x11Data && x11Data->x11_mask) { QX11PixmapData *pmData = static_cast<QX11PixmapData*>(pm.data); pmData->x11_mask = (Qt::HANDLE)XCreatePixmap(X11->display, @@ -1945,11 +1940,6 @@ void QPixmap::detach() if (data->ref != 1) { *this = copy(); -#if defined(Q_WS_MAC) && !defined(QT_MAC_NO_QUICKDRAW) - if (id == QPixmapData::MacClass) { - macData->qd_alpha = 0; - } -#endif } ++data->detach_no; |