diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-11-03 13:42:29 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-11-03 13:42:29 (GMT) |
| commit | 63f2cc8d9526d3fd8a64e62be2a469bf0eee54f0 (patch) | |
| tree | 7e6724964ceb6e38f478074780f06df0bdd11dbd /src/gui/kernel/qwidget_p.h | |
| parent | 6a89291da7e1322ad81c4939cc9d69db01957a4c (diff) | |
| parent | dc89c842779f87ce69882ba54fa8d5bb79e0edbd (diff) | |
| download | Qt-63f2cc8d9526d3fd8a64e62be2a469bf0eee54f0.zip Qt-63f2cc8d9526d3fd8a64e62be2a469bf0eee54f0.tar.gz Qt-63f2cc8d9526d3fd8a64e62be2a469bf0eee54f0.tar.bz2 | |
Merge branch '4.6' into mmfphonon
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 159a3f2..73a7d68 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -386,7 +386,6 @@ public: bool paintOnScreen() const; void invalidateGraphicsEffectsRecursively(); - QRegion getOpaqueRegion() const; const QRegion &getOpaqueChildren() const; void setDirtyOpaqueRegion(); @@ -819,7 +818,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; |