From 052e6a8e82b707749be2ecbad1af60effecefebb Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Thu, 30 Apr 2009 13:51:22 +0200
Subject: Removed a fiew compilation warnings on MSVC

---
 src/declarative/qml/qmlcomponent.h    | 2 +-
 src/declarative/qml/qmldom.cpp        | 2 ++
 src/declarative/util/qmlanimation.cpp | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
index 83d08ea..0493c1f 100644
--- a/src/declarative/qml/qmlcomponent.h
+++ b/src/declarative/qml/qmlcomponent.h
@@ -98,7 +98,7 @@ private:
     QmlComponent(QmlEngine *, QmlCompiledComponent *, int, int, QObject *parent);
 
     friend class QmlVME;
-    friend class QmlCompositeTypeData;
+    friend struct QmlCompositeTypeData;
 };
 QML_DECLARE_TYPE(QmlComponent);
 
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index 4e8e1f7..937c244 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -150,6 +150,8 @@ int QmlDomDocument::version() const
 */
 bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data)
 {
+    Q_UNUSED(engine);
+
     d->error = QString();
 
     QmlScriptParser parser;
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 7861e55..4bcc550 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -211,7 +211,7 @@ void QmlAbstractAnimationPrivate::commence()
 
     q->prepare(userProperty.value);
     q->qtAnimation()->start();
-    if (!q->qtAnimation()->state() == QAbstractAnimation::Running) {
+    if (q->qtAnimation()->state() != QAbstractAnimation::Running) {
         running = false;
         emit q->completed();
     }
-- 
cgit v0.12