diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-05 10:26:37 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-05 10:26:37 (GMT) |
| commit | eb75d1d6acf121fc08a591b4d6b34f1f39283bc2 (patch) | |
| tree | edeb63ea1072223c6bfc033f762c4595230515f5 /src/gui/image | |
| parent | 79ea01389d6ee188b9d24aa8c716a460e005b404 (diff) | |
| parent | f97c1d1b60a31b1738a8c19a1dd69255b794615f (diff) | |
| download | Qt-eb75d1d6acf121fc08a591b4d6b34f1f39283bc2.zip Qt-eb75d1d6acf121fc08a591b4d6b34f1f39283bc2.tar.gz Qt-eb75d1d6acf121fc08a591b4d6b34f1f39283bc2.tar.bz2 | |
Merge branch 'graphicseffect' into 4.6
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpixmapfilter.cpp | 3 | ||||
| -rw-r--r-- | src/gui/image/qpixmapfilter_p.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp index e50cc8b..d83ef2c 100644 --- a/src/gui/image/qpixmapfilter.cpp +++ b/src/gui/image/qpixmapfilter.cpp @@ -53,6 +53,7 @@ #include "private/qpaintengineex_p.h" #include "private/qpaintengine_raster_p.h" +#ifndef QT_NO_GRAPHICSEFFECT QT_BEGIN_NAMESPACE class QPixmapFilterPrivate : public QObjectPrivate @@ -1107,3 +1108,5 @@ void QPixmapDropShadowFilter::draw(QPainter *p, } QT_END_NAMESPACE + +#endif //QT_NO_GRAPHICSEFFECT diff --git a/src/gui/image/qpixmapfilter_p.h b/src/gui/image/qpixmapfilter_p.h index 6a96676..2573fc7 100644 --- a/src/gui/image/qpixmapfilter_p.h +++ b/src/gui/image/qpixmapfilter_p.h @@ -57,6 +57,7 @@ #include <QtGui/qpixmap.h> #include <QtGui/qgraphicseffect.h> +#ifndef QT_NO_GRAPHICSEFFECT QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -191,4 +192,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif //QT_NO_GRAPHICSEFFECT #endif // QPIXMAPFILTER_H |