From c18c209eebc4c2480bc75bfed70a46641bba936b Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 28 Aug 2012 16:49:37 +0200
Subject: [PATCH] Fix compiler warnings from MSVC2010

Change-Id: I44eb0113374c221a166609c4fd29b5dad05ecc94
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/qml/qml/v4/qv4bindings.cpp  | 5 +++++
 src/quick/items/qquickitem.cpp  | 4 ++--
 src/quick/util/qquickglobal.cpp | 4 ++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/qml/qml/v4/qv4bindings.cpp b/src/qml/qml/v4/qv4bindings.cpp
index 68e9a1a..2ad69de 100644
--- a/src/qml/qml/v4/qv4bindings.cpp
+++ b/src/qml/qml/v4/qv4bindings.cpp
@@ -70,6 +70,11 @@
 
 Q_DECLARE_METATYPE(QJSValue)
 
+#ifdef Q_CC_MSVC
+// MSVC2010 warns about 'unreferenced formal parameter', even if it's used in p->~T()
+#  pragma warning( disable : 4100 )
+#endif
+
 QT_BEGIN_NAMESPACE
 
 using namespace QQmlJS;
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 1bea8a8..7618c2f 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -3099,7 +3099,7 @@ void QQuickItem::inputMethodEvent(QInputMethodEvent *event)
     events for an item. The event information is provided by the
     \a event parameter.
   */
-void QQuickItem::focusInEvent(QFocusEvent *event)
+void QQuickItem::focusInEvent(QFocusEvent * /*event*/)
 {
 #ifndef QT_NO_ACCESSIBILITY
     QAccessibleEvent ev(this, QAccessible::Focus);
@@ -3112,7 +3112,7 @@ void QQuickItem::focusInEvent(QFocusEvent *event)
     events for an item. The event information is provided by the
     \a event parameter.
   */
-void QQuickItem::focusOutEvent(QFocusEvent *event)
+void QQuickItem::focusOutEvent(QFocusEvent * /*event*/)
 {
 }
 
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index 3d27e83..751e65b 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -49,6 +49,10 @@
 #include <QtGui/qdesktopservices.h>
 #include <QtGui/qfontdatabase.h>
 
+#ifdef Q_CC_MSVC
+// MSVC2010 warns about 'unused variable t', even if it's used in t->~T()
+#  pragma warning( disable : 4189 )
+#endif
 
 QT_BEGIN_NAMESPACE
 
-- 
2.7.4