diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-05-20 04:51:29 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-05-20 04:51:29 (GMT) |
| commit | e484ee27f929aca738a269947237d834dab89b39 (patch) | |
| tree | 216f95598411eb4c72141308973695d5e0d8b372 /src/declarative/fx/qfxrect.h | |
| parent | ded29009f766a8373193d94bcb8309270f66a266 (diff) | |
| parent | d1f1f2c91f63609ca1ffad32efdd6590f9f0ce6a (diff) | |
| download | Qt-e484ee27f929aca738a269947237d834dab89b39.zip Qt-e484ee27f929aca738a269947237d834dab89b39.tar.gz Qt-e484ee27f929aca738a269947237d834dab89b39.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxrect.h')
| -rw-r--r-- | src/declarative/fx/qfxrect.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxrect.h b/src/declarative/fx/qfxrect.h index 42e7b2f..420ec44 100644 --- a/src/declarative/fx/qfxrect.h +++ b/src/declarative/fx/qfxrect.h @@ -42,7 +42,7 @@ #ifndef QFXRECT_H #define QFXRECT_H -#include <qfxitem.h> +#include <QtDeclarative/qfxitem.h> QT_BEGIN_HEADER @@ -58,11 +58,11 @@ class Q_DECLARATIVE_EXPORT QFxPen : public QObject Q_PROPERTY(QColor color READ color WRITE setColor) public: QFxPen(QObject *parent=0) - : QObject(parent), _width(1), _color("#000000"), _valid(false) + : QObject(parent), _width(0), _color("#000000"), _valid(false) {} int width() const { return _width; } - void setWidth(int w) { _width = w; emit updated(); _valid = (_width < 1) ? false : true; } + void setWidth(int w); QColor color() const { return _color; } void setColor(const QColor &c); |