Fix warnings.

Change-Id: I7f066550fa2e1799f1c44b787da84c882f549b03
Reviewed-on: http://codereview.qt-project.org/5036
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

diff --git a/src/declarative/items/qsgcanvas.h b/src/declarative/items/qsgcanvas.h
index b396788..a2bb278 100644 (file)
--- a/src/declarative/items/qsgcanvas.h
+++ b/src/declarative/items/qsgcanvas.h
@@ -85,10 +85,8 @@ public:
     void setRenderTarget(QOpenGLFramebufferObject *fbo);
     QOpenGLFramebufferObject *renderTarget() const;
 
-signals:
-    void frameSwapped();
-
 Q_SIGNALS:
+    void frameSwapped();
     void sceneGraphInitialized();
 
 protected:
@@ -126,7 +124,7 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QSGCanvas *);
+Q_DECLARE_METATYPE(QSGCanvas *)
 
 QT_END_HEADER
 

diff --git a/src/declarative/items/qsgitem.h b/src/declarative/items/qsgitem.h
index 6653a4f..e340a6a 100644 (file)
--- a/src/declarative/items/qsgitem.h
+++ b/src/declarative/items/qsgitem.h
@@ -78,7 +78,7 @@ protected:
     QSGTransform(QSGTransformPrivate &dd, QObject *parent);
 
 private:
-    Q_DECLARE_PRIVATE(QSGTransform);
+    Q_DECLARE_PRIVATE(QSGTransform)
 };
 
 class QDeclarativeV8Function;
@@ -154,7 +154,7 @@ public:
         ItemClipsChildrenToShape  = 0x01,
         ItemAcceptsInputMethod    = 0x02,
         ItemIsFocusScope          = 0x04,
-        ItemHasContents           = 0x08,
+        ItemHasContents           = 0x08
         // Remember to increment the size of QSGItemPrivate::flags
     };
     Q_DECLARE_FLAGS(Flags, Flag)
@@ -167,7 +167,7 @@ public:
         ItemParentHasChanged,      // value.item
         ItemOpacityHasChanged,     // value.realValue
         ItemActiveFocusHasChanged, // value.boolValue
-        ItemRotationHasChanged,    // value.realValue
+        ItemRotationHasChanged     // value.realValue
     };
 
     union ItemChangeData {

diff --git a/src/declarative/items/qsgpainteditem.h b/src/declarative/items/qsgpainteditem.h
index 244e24b..2d5d260 100644 (file)
--- a/src/declarative/items/qsgpainteditem.h
+++ b/src/declarative/items/qsgpainteditem.h
@@ -108,8 +108,8 @@ protected:
     virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
 
 private:
-    Q_DISABLE_COPY(QSGPaintedItem);
-    Q_DECLARE_PRIVATE(QSGPaintedItem);
+    Q_DISABLE_COPY(QSGPaintedItem)
+    Q_DECLARE_PRIVATE(QSGPaintedItem)
 };
 
 QT_END_NAMESPACE

diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h
index e8e8f22..4cf4f06 100644 (file)
--- a/src/declarative/qml/qdeclarativeprivate.h
+++ b/src/declarative/qml/qdeclarativeprivate.h
@@ -251,7 +251,7 @@ namespace QDeclarativePrivate
         TypeRegistration       = 0, 
         InterfaceRegistration  = 1,
         AutoParentRegistration = 2,
-        ModuleApiRegistration  = 3,
+        ModuleApiRegistration  = 3
     };
 
     int Q_DECLARATIVE_EXPORT qmlregister(RegistrationType, void *);

diff --git a/src/declarative/scenegraph/coreapi/qsgnode.h b/src/declarative/scenegraph/coreapi/qsgnode.h
index c4f4674..58afff4 100644 (file)
--- a/src/declarative/scenegraph/coreapi/qsgnode.h
+++ b/src/declarative/scenegraph/coreapi/qsgnode.h
@@ -90,7 +90,7 @@ public:
                                       | DirtyClipList
                                       | DirtyNodeAdded
                                       | DirtyOpacity
-                                      | DirtyForceUpdate,
+                                      | DirtyForceUpdate
 
     };
     Q_DECLARE_FLAGS(DirtyFlags, DirtyFlag)
@@ -170,8 +170,8 @@ private:
     void *m_reserved;
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::DirtyFlags);
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::Flags);
+Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::DirtyFlags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::Flags)
 
 class Q_DECLARATIVE_EXPORT QSGBasicGeometryNode : public QSGNode
 {