diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-09 08:47:10 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-11 02:52:03 +0000 |
| commit | 93dc459f488f866db79ede1f27ef739a243764e4 (patch) | |
| tree | 8c5b859d5d7e093695a364b3257d31c70732c7e5 /src/widgets/effects | |
| parent | bb1e5675a5628b72edd32b975e78b7feba366ff9 (diff) | |
Convert features.graphicseffect to QT_[REQUIRE_]CONFIG
Change-Id: I1bb96088b2e9f2a2cfab5fceeebebe94fa6bb3a6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/effects')
| -rw-r--r-- | src/widgets/effects/qgraphicseffect.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/effects/qgraphicseffect.h | 6 | ||||
| -rw-r--r-- | src/widgets/effects/qgraphicseffect_p.h | 5 | ||||
| -rw-r--r-- | src/widgets/effects/qpixmapfilter.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/effects/qpixmapfilter_p.h | 5 |
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 |