diff options
author | axis <qt-info@nokia.com> | 2009-10-30 12:35:59 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-10-30 12:35:59 (GMT) |
commit | 8ab6921d227d1a89cc41d07af3f1a1a5b1304024 (patch) | |
tree | ce334acef4af23c81a7b24d28c8ad47237d4e002 /src/gui/kernel/qwidget_p.h | |
parent | 4e60cdcf222f607ccc49138035fb3d17140fee51 (diff) | |
parent | 7a2fbdaaf06e69b1b35c7e5560127ff5cd93f362 (diff) | |
download | Qt-8ab6921d227d1a89cc41d07af3f1a1a5b1304024.zip Qt-8ab6921d227d1a89cc41d07af3f1a1a5b1304024.tar.gz Qt-8ab6921d227d1a89cc41d07af3f1a1a5b1304024.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
-rw-r--r-- | src/gui/kernel/qwidget_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 159a3f2..616a972 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -819,7 +819,8 @@ public: QRectF boundingRect(Qt::CoordinateSystem system) const; void draw(QPainter *p); - QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset) const; + QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset, + QGraphicsEffectSource::PixmapPadMode mode) const; QWidget *m_widget; QWidgetPaintContext *context; |