diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-08 10:00:18 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-08 10:00:18 (GMT) |
commit | 136daef2ff117698c6788655bcd75e046ec84753 (patch) | |
tree | 99305b44b9820278e14ed9edcb513c2616ff9d2c /src/declarative/fx | |
parent | 0fcc46e34c7feedfa1758ead64b09be59813f7d1 (diff) | |
parent | db531c30eb73ff7aeac9cf07b06d6a108b2c13ec (diff) | |
download | Qt-136daef2ff117698c6788655bcd75e046ec84753.zip Qt-136daef2ff117698c6788655bcd75e046ec84753.tar.gz Qt-136daef2ff117698c6788655bcd75e046ec84753.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
Diffstat (limited to 'src/declarative/fx')
-rw-r--r-- | src/declarative/fx/qfxgridview.cpp | 2 | ||||
-rw-r--r-- | src/declarative/fx/qfxitem.cpp | 10 | ||||
-rw-r--r-- | src/declarative/fx/qfxitem.h | 2 | ||||
-rw-r--r-- | src/declarative/fx/qfxtextinput.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp index 9aa1198..a8b27f4 100644 --- a/src/declarative/fx/qfxgridview.cpp +++ b/src/declarative/fx/qfxgridview.cpp @@ -145,7 +145,7 @@ public: class QFxGridViewPrivate : public QFxFlickablePrivate { - Q_DECLARE_PUBLIC(QFxGridView); + Q_DECLARE_PUBLIC(QFxGridView) public: QFxGridViewPrivate() diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 4d31aaa..d6534a1 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -408,12 +408,12 @@ public: class QFxKeyNavigationAttached : public QObject, public QFxItemKeyFilter { Q_OBJECT - Q_DECLARE_PRIVATE(QFxKeyNavigationAttached); + Q_DECLARE_PRIVATE(QFxKeyNavigationAttached) - Q_PROPERTY(QFxItem *left READ left WRITE setLeft NOTIFY changed); - Q_PROPERTY(QFxItem *right READ right WRITE setRight NOTIFY changed); - Q_PROPERTY(QFxItem *up READ up WRITE setUp NOTIFY changed); - Q_PROPERTY(QFxItem *down READ down WRITE setDown NOTIFY changed); + Q_PROPERTY(QFxItem *left READ left WRITE setLeft NOTIFY changed) + Q_PROPERTY(QFxItem *right READ right WRITE setRight NOTIFY changed) + Q_PROPERTY(QFxItem *up READ up WRITE setUp NOTIFY changed) + Q_PROPERTY(QFxItem *down READ down WRITE setDown NOTIFY changed) public: QFxKeyNavigationAttached(QObject * = 0); diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h index 30c522f..bde0c9e 100644 --- a/src/declarative/fx/qfxitem.h +++ b/src/declarative/fx/qfxitem.h @@ -93,7 +93,7 @@ class Q_DECLARATIVE_EXPORT QFxItem : public QGraphicsObject, public QmlParserSta Q_PROPERTY(QmlList<QGraphicsTransform *>* transform READ transform DESIGNABLE false FINAL) Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin) Q_PROPERTY(bool smooth READ smoothTransform WRITE setSmoothTransform) - Q_PROPERTY(QGraphicsEffect *effect READ graphicsEffect WRITE setGraphicsEffect); + Q_PROPERTY(QGraphicsEffect *effect READ graphicsEffect WRITE setGraphicsEffect) Q_ENUMS(TransformOrigin) Q_CLASSINFO("DefaultProperty", "data") diff --git a/src/declarative/fx/qfxtextinput.h b/src/declarative/fx/qfxtextinput.h index b1e8b14..d5d0450 100644 --- a/src/declarative/fx/qfxtextinput.h +++ b/src/declarative/fx/qfxtextinput.h @@ -193,7 +193,7 @@ private Q_SLOTS: void updateRect(const QRect &r = QRect()); private: - Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxTextInput); + Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxTextInput) }; QT_END_NAMESPACE |