diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-06 05:56:57 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-06 05:56:57 (GMT) |
| commit | 164f2b1e013adcf829cdfac2875ab25109a7c578 (patch) | |
| tree | 072c58ae29329c2ba6a3d523d2260a720410dcfe /src/gui/effects/qgraphicseffect.h | |
| parent | b185b901ea31bfdc2db781e271132d34d0e8ce32 (diff) | |
| parent | faa534e55b9a03dabc44565e45f2f19297edf29d (diff) | |
| download | Qt-164f2b1e013adcf829cdfac2875ab25109a7c578.zip Qt-164f2b1e013adcf829cdfac2875ab25109a7c578.tar.gz Qt-164f2b1e013adcf829cdfac2875ab25109a7c578.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/effects/qgraphicseffect.h')
| -rw-r--r-- | src/gui/effects/qgraphicseffect.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/effects/qgraphicseffect.h b/src/gui/effects/qgraphicseffect.h index 7335a25..5c73f4b 100644 --- a/src/gui/effects/qgraphicseffect.h +++ b/src/gui/effects/qgraphicseffect.h @@ -48,6 +48,7 @@ #include <QtGui/qcolor.h> #include <QtGui/qbrush.h> +#ifndef QT_NO_GRAPHICSEFFECT QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -302,6 +303,7 @@ private: QT_END_NAMESPACE QT_END_HEADER +#endif //QT_NO_GRAPHICSEFFECT #endif // QGRAPHICSEFFECT_H |