diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 07:24:18 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 07:24:18 (GMT) |
| commit | ebe228f3ecaa379bbfa1e8a48b0aba820a5c8254 (patch) | |
| tree | 131f616937c6b718702ff3ccb9370eeae7b4c9b6 /src/gui/kernel/qwidget_p.h | |
| parent | 9418962051579959981515bb74bf6463436aa75e (diff) | |
| parent | faa534e55b9a03dabc44565e45f2f19297edf29d (diff) | |
| download | Qt-ebe228f3ecaa379bbfa1e8a48b0aba820a5c8254.zip Qt-ebe228f3ecaa379bbfa1e8a48b0aba820a5c8254.tar.gz Qt-ebe228f3ecaa379bbfa1e8a48b0aba820a5c8254.tar.bz2 | |
Merge remote branch 'qt-official/4.6' into 4.6
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 8b03a85..151b90a 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -384,7 +384,9 @@ public: void setOpaque(bool opaque); void updateIsTranslucent(); bool paintOnScreen() const; +#ifndef QT_NO_GRAPHICSEFFECT void invalidateGraphicsEffectsRecursively(); +#endif //QT_NO_GRAPHICSEFFECT const QRegion &getOpaqueChildren() const; void setDirtyOpaqueRegion(); @@ -530,8 +532,10 @@ public: inline QRect effectiveRectFor(const QRect &rect) const { +#ifndef QT_NO_GRAPHICSEFFECT if (graphicsEffect && graphicsEffect->isEnabled()) return graphicsEffect->boundingRectFor(rect).toAlignedRect(); +#endif //QT_NO_GRAPHICSEFFECT return rect; } @@ -774,6 +778,7 @@ struct QWidgetPaintContext QPainter *painter; }; +#ifndef QT_NO_GRAPHICSEFFECT class QWidgetEffectSourcePrivate : public QGraphicsEffectSourcePrivate { public: @@ -826,6 +831,7 @@ public: QTransform lastEffectTransform; bool updateDueToGraphicsEffect; }; +#endif //QT_NO_GRAPHICSEFFECT inline QWExtra *QWidgetPrivate::extraData() const { |