5 files changed, 6 insertions, 16 deletions
diff --git a/src/widgets/effects/qgraphicseffect.cpp b/src/widgets/effects/qgraphicseffect.cpp
index 4d1d1e9896..028010d3dd 100644
--- a/src/widgets/effects/qgraphicseffect.cpp
+++ b/src/widgets/effects/qgraphicseffect.cpp
@@ -114,7 +114,6 @@
 #include <QtCore/qdebug.h>
 #include <private/qdrawhelper_p.h>
 
-#ifndef QT_NO_GRAPHICSEFFECT
 QT_BEGIN_NAMESPACE
 
 QGraphicsEffectPrivate::~QGraphicsEffectPrivate()
@@ -1237,5 +1236,3 @@ QT_END_NAMESPACE
 
 #include "moc_qgraphicseffect.cpp"
 #include "moc_qgraphicseffect_p.cpp"
-
-#endif //QT_NO_GRAPHICSEFFECT
diff --git a/src/widgets/effects/qgraphicseffect.h b/src/widgets/effects/qgraphicseffect.h
index 8e07e51dca..78d025ded5 100644
--- a/src/widgets/effects/qgraphicseffect.h
+++ b/src/widgets/effects/qgraphicseffect.h
@@ -47,9 +47,9 @@
 #include <QtGui/qcolor.h>
 #include <QtGui/qbrush.h>
 
-#ifndef QT_NO_GRAPHICSEFFECT
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(graphicseffect);
 
+QT_BEGIN_NAMESPACE
 
 class QGraphicsItem;
 class QStyleOption;
@@ -279,7 +279,5 @@ private:
 
 QT_END_NAMESPACE
 
-#endif //QT_NO_GRAPHICSEFFECT
-
 #endif // QGRAPHICSEFFECT_H
 
diff --git a/src/widgets/effects/qgraphicseffect_p.h b/src/widgets/effects/qgraphicseffect_p.h
index 12bdbfe6fc..c5c7ff5900 100644
--- a/src/widgets/effects/qgraphicseffect_p.h
+++ b/src/widgets/effects/qgraphicseffect_p.h
@@ -59,7 +59,8 @@
 #include <private/qobject_p.h>
 #include <private/qpixmapfilter_p.h>
 
-#ifndef QT_NO_GRAPHICSEFFECT
+QT_REQUIRE_CONFIG(graphicseffect);
+
 QT_BEGIN_NAMESPACE
 
 class QGraphicsEffectSourcePrivate;
@@ -226,6 +227,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif //QT_NO_GRAPHICSEFFECT
 #endif // QGRAPHICSEFFECT_P_H
-
diff --git a/src/widgets/effects/qpixmapfilter.cpp b/src/widgets/effects/qpixmapfilter.cpp
index 999e551af4..9d70825b0e 100644
--- a/src/widgets/effects/qpixmapfilter.cpp
+++ b/src/widgets/effects/qpixmapfilter.cpp
@@ -54,7 +54,6 @@
 #include "private/qmemrotate_p.h"
 #include "private/qdrawhelper_p.h"
 
-#ifndef QT_NO_GRAPHICSEFFECT
 QT_BEGIN_NAMESPACE
 
 class QPixmapFilterPrivate : public QObjectPrivate
@@ -1353,5 +1352,3 @@ void QPixmapDropShadowFilter::draw(QPainter *p,
 QT_END_NAMESPACE
 
 #include "moc_qpixmapfilter_p.cpp"
-
-#endif //QT_NO_GRAPHICSEFFECT
diff --git a/src/widgets/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h
index b9af3ae916..399a835142 100644
--- a/src/widgets/effects/qpixmapfilter_p.h
+++ b/src/widgets/effects/qpixmapfilter_p.h
@@ -56,9 +56,9 @@
 #include <QtGui/qpixmap.h>
 #include <QtWidgets/qgraphicseffect.h>
 
-#ifndef QT_NO_GRAPHICSEFFECT
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(graphicseffect);
 
+QT_BEGIN_NAMESPACE
 
 class QPainter;
 class QPlatformPixmap;
@@ -187,5 +187,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif //QT_NO_GRAPHICSEFFECT
 #endif // QPIXMAPFILTER_H