diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-04-27 07:41:55 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-04-27 07:41:55 (GMT) |
| commit | d545dc70c03eca620275658450402f67af166ef0 (patch) | |
| tree | 5bc89fe7637e2be90c8bf70a6fb7f2a7e31c6eea /src/declarative/fx/qfxitem.h | |
| parent | d782ceee4de31bc4a11cd6cdeacc881bd1c118d8 (diff) | |
| parent | d62bc81491b4b3ef76d626fd56f736427ee1e20c (diff) | |
| download | Qt-d545dc70c03eca620275658450402f67af166ef0.zip Qt-d545dc70c03eca620275658450402f67af166ef0.tar.gz Qt-d545dc70c03eca620275658450402f67af166ef0.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfxitem.cpp
Diffstat (limited to 'src/declarative/fx/qfxitem.h')
| -rw-r--r-- | src/declarative/fx/qfxitem.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h index 3f7784b..b76235b 100644 --- a/src/declarative/fx/qfxitem.h +++ b/src/declarative/fx/qfxitem.h @@ -121,7 +121,7 @@ class Q_DECLARATIVE_EXPORT QFxItem : public QSimpleCanvasItem, public QmlParserS Q_PROPERTY(bool flipVertically READ flipVertically WRITE setFlipVertically) Q_PROPERTY(bool flipHorizontally READ flipHorizontally WRITE setFlipHorizontally) Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged) - Q_PROPERTY(int baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged ) + Q_PROPERTY(int baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged) Q_PROPERTY(QFxAnchorLine left READ left) Q_PROPERTY(QFxAnchorLine right READ right) Q_PROPERTY(QFxAnchorLine horizontalCenter READ horizontalCenter) @@ -209,8 +209,6 @@ public: bool keepMouseGrab() const; void setKeepMouseGrab(bool); - QmlContext *itemContext() const; - public Q_SLOTS: void newChild(const QString &url); |