Fixes some compilation warnings.

8 files changed, 30 insertions, 30 deletions

diff --git a/src/canvas/qvsyncanimationdriver_p.h b/src/canvas/qvsyncanimationdriver_p.h
index c1b92b8..8e8eb3e 100644
--- a/src/canvas/qvsyncanimationdriver_p.h
+++ b/src/canvas/qvsyncanimationdriver_p.h
@@ -9,7 +9,7 @@ class QVSyncAnimationDriver : public QAnimationDriver
 {
     Q_OBJECT
 
-    Q_DECLARE_PRIVATE(QVSyncAnimationDriver);
+    Q_DECLARE_PRIVATE(QVSyncAnimationDriver)
 
 public:
     QVSyncAnimationDriver(QObject *parent = 0);
diff --git a/src/effects/shadereffectitem.h b/src/effects/shadereffectitem.h
index 15cfb54..1aa5c5c 100644
--- a/src/effects/shadereffectitem.h
+++ b/src/effects/shadereffectitem.h
@@ -59,21 +59,21 @@ class QGLFramebufferObject;
 class ShaderEffectSource : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QxItem *sourceItem READ sourceItem WRITE setSourceItem NOTIFY sourceItemChanged);
-    Q_PROPERTY(QUrl sourceImage READ sourceImage WRITE setSourceImage NOTIFY sourceImageChanged);
-    Q_PROPERTY(FilterMode mipmap READ mipmap WRITE setMipmap NOTIFY mipmapChanged);
-    Q_PROPERTY(FilterMode filtering READ filtering WRITE setFiltering NOTIFY filteringChanged);
-    Q_PROPERTY(WrapMode horizontalWrap READ horizontalWrap WRITE setHorizontalWrap NOTIFY horizontalWrapChanged);
-    Q_PROPERTY(WrapMode verticalWrap READ verticalWrap WRITE setVerticalWrap NOTIFY verticalWrapChanged);
-    Q_PROPERTY(QSize margins READ margins WRITE setMargins NOTIFY marginsChanged);
-    Q_PROPERTY(QSize textureSize READ textureSize WRITE setTextureSize NOTIFY textureSizeChanged);
-    Q_PROPERTY(int width READ width NOTIFY widthChanged);
-    Q_PROPERTY(int height READ height NOTIFY heightChanged);
-    Q_PROPERTY(bool static READ isStatic WRITE setStatic NOTIFY staticChanged);
-    Q_PROPERTY(bool hideOriginal READ hideOriginal WRITE setHideOriginal NOTIFY hideOriginalChanged);
-    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged);
-    Q_ENUMS(FilterMode);
-    Q_ENUMS(WrapMode);
+    Q_PROPERTY(QxItem *sourceItem READ sourceItem WRITE setSourceItem NOTIFY sourceItemChanged)
+    Q_PROPERTY(QUrl sourceImage READ sourceImage WRITE setSourceImage NOTIFY sourceImageChanged)
+    Q_PROPERTY(FilterMode mipmap READ mipmap WRITE setMipmap NOTIFY mipmapChanged)
+    Q_PROPERTY(FilterMode filtering READ filtering WRITE setFiltering NOTIFY filteringChanged)
+    Q_PROPERTY(WrapMode horizontalWrap READ horizontalWrap WRITE setHorizontalWrap NOTIFY horizontalWrapChanged)
+    Q_PROPERTY(WrapMode verticalWrap READ verticalWrap WRITE setVerticalWrap NOTIFY verticalWrapChanged)
+    Q_PROPERTY(QSize margins READ margins WRITE setMargins NOTIFY marginsChanged)
+    Q_PROPERTY(QSize textureSize READ textureSize WRITE setTextureSize NOTIFY textureSizeChanged)
+    Q_PROPERTY(int width READ width NOTIFY widthChanged)
+    Q_PROPERTY(int height READ height NOTIFY heightChanged)
+    Q_PROPERTY(bool static READ isStatic WRITE setStatic NOTIFY staticChanged)
+    Q_PROPERTY(bool hideOriginal READ hideOriginal WRITE setHideOriginal NOTIFY hideOriginalChanged)
+    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
+    Q_ENUMS(FilterMode)
+    Q_ENUMS(WrapMode)
 
 public:
     enum FilterMode
@@ -214,11 +214,11 @@ private:
 class ShaderEffectItem : public QxItem, public AbstractEffect
 {
     Q_OBJECT
-    Q_PROPERTY(QString fragmentShader READ fragmentShader WRITE setFragmentShader NOTIFY fragmentShaderChanged);
-    Q_PROPERTY(QString vertexShader READ vertexShader WRITE setVertexShader NOTIFY vertexShaderChanged);
-    Q_PROPERTY(bool blending READ blending WRITE setBlending NOTIFY blendingChanged);
-    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged);
-    Q_PROPERTY(QSize meshResolution READ meshResolution WRITE setMeshResolution NOTIFY meshResolutionChanged);
+    Q_PROPERTY(QString fragmentShader READ fragmentShader WRITE setFragmentShader NOTIFY fragmentShaderChanged)
+    Q_PROPERTY(QString vertexShader READ vertexShader WRITE setVertexShader NOTIFY vertexShaderChanged)
+    Q_PROPERTY(bool blending READ blending WRITE setBlending NOTIFY blendingChanged)
+    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+    Q_PROPERTY(QSize meshResolution READ meshResolution WRITE setMeshResolution NOTIFY meshResolutionChanged)
 
 public:
     ShaderEffectItem(QxItem *parent = 0);
diff --git a/src/graphicsitems/qxfocusscope_p.h b/src/graphicsitems/qxfocusscope_p.h
index 4dabf62..60483e1 100644
--- a/src/graphicsitems/qxfocusscope_p.h
+++ b/src/graphicsitems/qxfocusscope_p.h
@@ -54,7 +54,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QxFocusScope)
-    Q_DECLARE_PRIVATE(QxItem);
+    Q_DECLARE_PRIVATE(QxItem)
 };
 
 QML_DECLARE_TYPE(QxFocusScope)
diff --git a/src/graphicsitems/qxitem.h b/src/graphicsitems/qxitem.h
index 818458f..0345023 100644
--- a/src/graphicsitems/qxitem.h
+++ b/src/graphicsitems/qxitem.h
@@ -76,8 +76,8 @@ class QT_SCENEGRAPH_EXPORT QxItem : public QObject, public QDeclarativeParserSta
     Q_PROPERTY(qreal rotation READ rotation WRITE setRotation NOTIFY rotationChanged)
     Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged RESET resetWidth FINAL)
     Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY heightChanged RESET resetHeight FINAL)
-    Q_PROPERTY(bool clip READ clip WRITE setClip NOTIFY clipChanged);
-    Q_PROPERTY(QDeclarativeListProperty<QxItem> children READ children);
+    Q_PROPERTY(bool clip READ clip WRITE setClip NOTIFY clipChanged)
+    Q_PROPERTY(QDeclarativeListProperty<QxItem> children READ children)
     Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin NOTIFY transformOriginChanged)
     Q_PROPERTY(QDeclarativeListProperty<QGraphicsTransform> transform READ transformations DESIGNABLE false FINAL)
     Q_PROPERTY(QxItem *parent READ parentItem WRITE setParentItem NOTIFY parentChanged DESIGNABLE false FINAL)
@@ -101,7 +101,7 @@ class QT_SCENEGRAPH_EXPORT QxItem : public QObject, public QDeclarativeParserSta
     Q_PROPERTY(bool smooth READ smooth WRITE setSmooth NOTIFY smoothChanged)
 
     // We might remove this property later.
-    Q_PROPERTY(bool childrenDoNotOverlap READ childrenDoNotOverlap WRITE setChildrenDoNotOverlap NOTIFY childrenDoNotOverlapChanged);
+    Q_PROPERTY(bool childrenDoNotOverlap READ childrenDoNotOverlap WRITE setChildrenDoNotOverlap NOTIFY childrenDoNotOverlapChanged)
 
     Q_ENUMS(TransformOrigin)
     Q_CLASSINFO("DefaultProperty", "data")
diff --git a/src/scenegraph/coreapi/material.h b/src/scenegraph/coreapi/material.h
index aff14f8..70ecf6f 100644
--- a/src/scenegraph/coreapi/material.h
+++ b/src/scenegraph/coreapi/material.h
@@ -99,7 +99,7 @@ public:
         Blending        = 0x0001,
         SupportsPicking = 0x0002
     };
-    Q_DECLARE_FLAGS(Flags, Flag);
+    Q_DECLARE_FLAGS(Flags, Flag)
 
     virtual AbstractEffectType *type() const = 0;
     virtual AbstractEffectProgram *createProgram() const = 0;
diff --git a/src/scenegraph/coreapi/node.h b/src/scenegraph/coreapi/node.h
index 247710e..43365d8 100644
--- a/src/scenegraph/coreapi/node.h
+++ b/src/scenegraph/coreapi/node.h
@@ -97,7 +97,7 @@ public:
 //        DirtyRenderOrderSubtree     = DirtyRenderOrder << 16,
 //        DirtyAllSubtree             = 0xffff0000
     };
-    Q_DECLARE_FLAGS(DirtyFlags, DirtyFlag);
+    Q_DECLARE_FLAGS(DirtyFlags, DirtyFlag)
 
     enum Flag {
         OwnedByParent               = 0x0001,
@@ -105,7 +105,7 @@ public:
         ChildrenDoNotOverloap       = 0x0004,
         ClipIsRectangular           = 0x0008
     };
-    Q_DECLARE_FLAGS(Flags, Flag);
+    Q_DECLARE_FLAGS(Flags, Flag)
 
     enum NodeSubType {
         DefaultNodeSubType,
diff --git a/src/scenegraph/coreapi/qsgcontext.h b/src/scenegraph/coreapi/qsgcontext.h
index afdb34b..a5b0ebc 100644
--- a/src/scenegraph/coreapi/qsgcontext.h
+++ b/src/scenegraph/coreapi/qsgcontext.h
@@ -18,7 +18,7 @@ class QSGTextureManager;
 class QT_SCENEGRAPH_EXPORT QSGContext : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSGContext);
+    Q_DECLARE_PRIVATE(QSGContext)
 
 public:
     explicit QSGContext(QObject *parent = 0);
diff --git a/src/scenegraph/coreapi/renderer.h b/src/scenegraph/coreapi/renderer.h
index fc11a63..8da4010 100644
--- a/src/scenegraph/coreapi/renderer.h
+++ b/src/scenegraph/coreapi/renderer.h
@@ -92,7 +92,7 @@ public:
         UpdateMaterials             = 0x00000010,
         UpdateAll                   = 0x7FFFFFFF
     };
-    Q_DECLARE_FLAGS(Updates, Update);
+    Q_DECLARE_FLAGS(Updates, Update)
 
     enum ClipType
     {