diff options
author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:34:32 -0700 |
---|---|---|
committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:36:10 -0700 |
commit | d38fe875c7850ca2c6ca28f91e94ae276735fac8 (patch) | |
tree | e5c92cef74e0853490d77cf0139b23f00d548a6e /src/widgets/effects/qgraphicseffect.h | |
parent | ac4e848c9802377b7c4ff673180f28b9ca76b746 (diff) | |
parent | 627f0a7f7d775ecd263b95dd07fca44bfcb0c5cf (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmainwindowlayout.cpp
Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
Diffstat (limited to 'src/widgets/effects/qgraphicseffect.h')
-rw-r--r-- | src/widgets/effects/qgraphicseffect.h | 6 |
1 files changed, 2 insertions, 4 deletions
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 |