diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-19 15:00:17 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-19 15:01:20 (GMT) |
| commit | 457b34bbac3b9e7f9154ac2d729c9f7e8cdee8b2 (patch) | |
| tree | d0d83152e642556cc926f4dbded7f7350057367e /src/gui | |
| parent | ae1b9c676dc9c590008de58ce0ab51bff3ef0f9e (diff) | |
| download | Qt-457b34bbac3b9e7f9154ac2d729c9f7e8cdee8b2.zip Qt-457b34bbac3b9e7f9154ac2d729c9f7e8cdee8b2.tar.gz Qt-457b34bbac3b9e7f9154ac2d729c9f7e8cdee8b2.tar.bz2 | |
Cleanup after 19e01c93f9421a8db6c8a93ac103a7df2b93d9ec
QGraphicsEffect is no longer dependent on the Graphics View module.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/effects/qgraphicseffect.cpp | 3 | ||||
| -rw-r--r-- | src/gui/effects/qgraphicseffect.h | 18 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp index ba13b25..1d604b5 100644 --- a/src/gui/effects/qgraphicseffect.cpp +++ b/src/gui/effects/qgraphicseffect.cpp @@ -94,8 +94,6 @@ #include "qgraphicseffect_p.h" -#ifndef QT_NO_GRAPHICSVIEW - #include <QtGui/qimage.h> #include <QtGui/qpainter.h> #include <QtCore/qrect.h> @@ -718,4 +716,3 @@ void QGraphicsShadowEffect::draw(QPainter *painter, QGraphicsEffectSource *sourc painter->setWorldTransform(restoreTransform); } -#endif diff --git a/src/gui/effects/qgraphicseffect.h b/src/gui/effects/qgraphicseffect.h index 74839cd..8890a48 100644 --- a/src/gui/effects/qgraphicseffect.h +++ b/src/gui/effects/qgraphicseffect.h @@ -51,8 +51,6 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW - class QGraphicsItem; class QStyleOption; class QColor; @@ -154,7 +152,8 @@ private: }; class QGraphicsColorizeEffectPrivate; -class Q_GUI_EXPORT QGraphicsColorizeEffect: public QGraphicsEffect { +class Q_GUI_EXPORT QGraphicsColorizeEffect: public QGraphicsEffect +{ Q_OBJECT Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) public: @@ -178,7 +177,8 @@ private: }; class QGraphicsPixelizeEffectPrivate; -class Q_GUI_EXPORT QGraphicsPixelizeEffect: public QGraphicsEffect { +class Q_GUI_EXPORT QGraphicsPixelizeEffect: public QGraphicsEffect +{ Q_OBJECT Q_PROPERTY(int pixelSize READ pixelSize WRITE setPixelSize NOTIFY pixelSizeChanged) public: @@ -202,7 +202,8 @@ private: }; class QGraphicsBlurEffectPrivate; -class Q_GUI_EXPORT QGraphicsBlurEffect: public QGraphicsEffect { +class Q_GUI_EXPORT QGraphicsBlurEffect: public QGraphicsEffect +{ Q_OBJECT Q_PROPERTY(int blurRadius READ blurRadius WRITE setBlurRadius NOTIFY blurRadiusChanged) public: @@ -227,7 +228,8 @@ private: }; class QGraphicsShadowEffectPrivate; -class Q_GUI_EXPORT QGraphicsShadowEffect: public QGraphicsEffect { +class Q_GUI_EXPORT QGraphicsShadowEffect: public QGraphicsEffect +{ Q_OBJECT Q_PROPERTY(QPointF shadowOffset READ shadowOffset WRITE setShadowOffset NOTIFY shadowOffsetChanged) Q_PROPERTY(int blurRadius READ blurRadius WRITE setBlurRadius NOTIFY blurRadiusChanged) @@ -263,11 +265,9 @@ private: Q_DISABLE_COPY(QGraphicsShadowEffect) }; -#endif // QT_NO_GRAPHICSVIEW - QT_END_NAMESPACE QT_END_HEADER - #endif // QGRAPHICSEFFECT_H + |