Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

3 files changed, 7 insertions, 7 deletions

diff --git a/src/declarative/extra/qfxflowview.cpp b/src/declarative/extra/qfxflowview.cpp
index 412cbc8..1676512 100644
--- a/src/declarative/extra/qfxflowview.cpp
+++ b/src/declarative/extra/qfxflowview.cpp
@@ -49,8 +49,8 @@ QT_BEGIN_NAMESPACE
 class QFxFlowViewAttached : public QObject
 {
 Q_OBJECT
-Q_PROPERTY(int row READ row NOTIFY posChanged);
-Q_PROPERTY(int column READ column NOTIFY posChanged);
+Q_PROPERTY(int row READ row NOTIFY posChanged)
+Q_PROPERTY(int column READ column NOTIFY posChanged)
 public:
     QFxFlowViewAttached(QObject *parent);
 
diff --git a/src/declarative/extra/qfxflowview.h b/src/declarative/extra/qfxflowview.h
index 126f567..c2b30a3 100644
--- a/src/declarative/extra/qfxflowview.h
+++ b/src/declarative/extra/qfxflowview.h
@@ -58,8 +58,8 @@ class Q_DECLARATIVE_EXPORT QFxFlowView : public QFxItem
 {
     Q_OBJECT
     Q_PROPERTY(QFxVisualItemModel *model READ model WRITE setModel)
-    Q_PROPERTY(int column READ columns WRITE setColumns);
-    Q_PROPERTY(bool vertical READ vertical WRITE setVertical);
+    Q_PROPERTY(int column READ columns WRITE setColumns)
+    Q_PROPERTY(bool vertical READ vertical WRITE setVertical)
 
 public:
     QFxFlowView();
@@ -101,7 +101,7 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QFxFlowView);
+QML_DECLARE_TYPE(QFxFlowView)
 
 QT_END_HEADER
 
diff --git a/src/declarative/extra/qmlbehaviour.cpp b/src/declarative/extra/qmlbehaviour.cpp
index c7ab1da..92a85b0 100644
--- a/src/declarative/extra/qmlbehaviour.cpp
+++ b/src/declarative/extra/qmlbehaviour.cpp
@@ -57,8 +57,8 @@ public:
     QmlBehaviourData(QObject *parent)
         : QObject(parent) {}
 
-    Q_PROPERTY(QVariant endValue READ endValue NOTIFY valuesChanged);
-    Q_PROPERTY(QVariant startValue READ startValue NOTIFY valuesChanged);
+    Q_PROPERTY(QVariant endValue READ endValue NOTIFY valuesChanged)
+    Q_PROPERTY(QVariant startValue READ startValue NOTIFY valuesChanged)
     QVariant endValue() const { return e; }
     QVariant startValue() const { return s; }