summaryrefslogtreecommitdiffstats
path: root/src/gui/effects/qgraphicseffect.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2009-11-05 10:26:37 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2009-11-05 10:26:37 (GMT)
commiteb75d1d6acf121fc08a591b4d6b34f1f39283bc2 (patch)
treeedeb63ea1072223c6bfc033f762c4595230515f5 /src/gui/effects/qgraphicseffect.cpp
parent79ea01389d6ee188b9d24aa8c716a460e005b404 (diff)
parentf97c1d1b60a31b1738a8c19a1dd69255b794615f (diff)
downloadQt-eb75d1d6acf121fc08a591b4d6b34f1f39283bc2.zip
Qt-eb75d1d6acf121fc08a591b4d6b34f1f39283bc2.tar.gz
Qt-eb75d1d6acf121fc08a591b4d6b34f1f39283bc2.tar.bz2
Merge branch 'graphicseffect' into 4.6
Diffstat (limited to 'src/gui/effects/qgraphicseffect.cpp')
-rw-r--r--src/gui/effects/qgraphicseffect.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp
index 83f4f79..d7e838e 100644
--- a/src/gui/effects/qgraphicseffect.cpp
+++ b/src/gui/effects/qgraphicseffect.cpp
@@ -108,6 +108,7 @@
#include <QtCore/qdebug.h>
#include <private/qdrawhelper_p.h>
+#ifndef QT_NO_GRAPHICSEFFECT
QT_BEGIN_NAMESPACE
/*!
@@ -1128,3 +1129,4 @@ void QGraphicsOpacityEffect::draw(QPainter *painter, QGraphicsEffectSource *sour
QT_END_NAMESPACE
+#endif //QT_NO_GRAPHICSEFFECT