From 93f39956f24255a40d438b17257dfb0efcc1b76f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 20 Apr 2011 10:48:43 +0200
Subject: [PATCH] Fix compiler warnings.

---
 .../designercore/instances/nodeinstanceclientproxy.cpp          | 1 -
 .../designercore/instances/nodeinstanceserverproxy.cpp          | 2 --
 tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp          | 1 +
 tests/valgrind/memcheck/testapps/syscall/main.cpp               | 2 ++
 tests/valgrind/memcheck/testapps/uninit1/main.cpp               | 2 ++
 tests/valgrind/memcheck/testapps/uninit2/main.cpp               | 2 ++
 tests/valgrind/memcheck/testapps/uninit3/main.cpp               | 2 ++
 7 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceclientproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceclientproxy.cpp
index 606218b520b..eaa483a2f7a 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceclientproxy.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceclientproxy.cpp
@@ -96,7 +96,6 @@ NodeInstanceClientProxy::NodeInstanceClientProxy(QObject *parent)
 
 void NodeInstanceClientProxy::writeCommand(const QVariant &command)
 {
-    static unsigned int commandCounter = 0;
     QByteArray block;
     QDataStream out(&block, QIODevice::WriteOnly);
     out << quint32(0);
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
index 0cbc7a9c716..5c6c4854769 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
@@ -277,7 +277,6 @@ void NodeInstanceServerProxy::processFinished(int /*exitCode*/, QProcess::ExitSt
 
 void NodeInstanceServerProxy::readFirstDataStream()
 {
-    static unsigned int lastCommandCounter = 0;
     QList<QVariant> commandList;
 
     while (!m_firstSocket->atEnd()) {
@@ -315,7 +314,6 @@ void NodeInstanceServerProxy::readFirstDataStream()
 
 void NodeInstanceServerProxy::readSecondDataStream()
 {
-    static unsigned int lastCommandCounter = 0;
     QList<QVariant> commandList;
 
     while (!m_secondSocket->atEnd()) {
diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
index ab3bd28531e..98ef608c9f1 100644
--- a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
+++ b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
@@ -2559,6 +2559,7 @@ void testMPI()
 int main(int argc, char *argv[])
 {
     int *x = new int(32);
+    Q_UNUSED(x);
     testQXmlAttributes();
     testQRegExp();
     testInlineBreakpoints();
diff --git a/tests/valgrind/memcheck/testapps/syscall/main.cpp b/tests/valgrind/memcheck/testapps/syscall/main.cpp
index fcf3363791d..2411cb909ab 100644
--- a/tests/valgrind/memcheck/testapps/syscall/main.cpp
+++ b/tests/valgrind/memcheck/testapps/syscall/main.cpp
@@ -1,3 +1,5 @@
+#pragma GCC diagnostic ignored "-Wuninitialized"
+
 int main()
 {
     int i;
diff --git a/tests/valgrind/memcheck/testapps/uninit1/main.cpp b/tests/valgrind/memcheck/testapps/uninit1/main.cpp
index ab571da1804..301da075fe6 100644
--- a/tests/valgrind/memcheck/testapps/uninit1/main.cpp
+++ b/tests/valgrind/memcheck/testapps/uninit1/main.cpp
@@ -1,3 +1,5 @@
+#pragma GCC diagnostic ignored "-Wuninitialized"
+
 int main()
 {
     bool b;
diff --git a/tests/valgrind/memcheck/testapps/uninit2/main.cpp b/tests/valgrind/memcheck/testapps/uninit2/main.cpp
index 75cc9bdfa34..0deb9566482 100644
--- a/tests/valgrind/memcheck/testapps/uninit2/main.cpp
+++ b/tests/valgrind/memcheck/testapps/uninit2/main.cpp
@@ -1,3 +1,5 @@
+#pragma GCC diagnostic ignored "-Wuninitialized"
+
 int main()
 {
     int *i;
diff --git a/tests/valgrind/memcheck/testapps/uninit3/main.cpp b/tests/valgrind/memcheck/testapps/uninit3/main.cpp
index b0c392d211a..5320e6d5f36 100644
--- a/tests/valgrind/memcheck/testapps/uninit3/main.cpp
+++ b/tests/valgrind/memcheck/testapps/uninit3/main.cpp
@@ -1,3 +1,5 @@
+#pragma GCC diagnostic ignored "-Wuninitialized"
+
 int main()
 {
     int *i;