diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-05-31 11:53:27 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-05-31 11:53:27 (GMT) |
| commit | 312fc45afc6829cf4af54f03d59548350d7be4e0 (patch) | |
| tree | 74594f9e2e0df61592b4f45e483f1526bff58a31 /src/gui/image/qpixmap.h | |
| parent | 39317d9583a4def0b7d1085778e302a8ccb3be86 (diff) | |
| parent | 50958288e4493920f18ef9f9b062e01bd4782239 (diff) | |
| download | Qt-312fc45afc6829cf4af54f03d59548350d7be4e0.zip Qt-312fc45afc6829cf4af54f03d59548350d7be4e0.tar.gz Qt-312fc45afc6829cf4af54f03d59548350d7be4e0.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/image/qpixmap.h')
| -rw-r--r-- | src/gui/image/qpixmap.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 180af3b..82546da 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -271,9 +271,7 @@ private: friend class QX11PaintEngine; friend class QCoreGraphicsPaintEngine; friend class QWidgetPrivate; - friend class QRasterPaintEngine; friend class QRasterBuffer; - friend class QPixmapCacheEntry; #if !defined(QT_NO_DATASTREAM) friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPixmap &); #endif |