From 4746bad937a4abfc413aa56f316fc25115fe0525 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 29 Apr 2011 18:49:11 +0200
Subject: Silence the callgrind warnings in our source code when using gcc 4.6

---
 src/testlib/qbenchmarkvalgrind.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/testlib/qbenchmarkvalgrind.cpp b/src/testlib/qbenchmarkvalgrind.cpp
index 4b260e8..22c7c37 100644
--- a/src/testlib/qbenchmarkvalgrind.cpp
+++ b/src/testlib/qbenchmarkvalgrind.cpp
@@ -225,6 +225,12 @@ bool QBenchmarkValgrindUtils::runCallgrindSubProcess(const QStringList &origAppA
     return finishedOk;
 }
 
+#if defined(Q_CC_GNU) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
+// the callgrind macros below generate warnings
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+
 void QBenchmarkCallgrindMeasurer::start()
 {
     CALLGRIND_ZERO_STATS;
@@ -237,6 +243,11 @@ qint64 QBenchmarkCallgrindMeasurer::checkpoint()
     return result;
 }
 
+#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
+// the callgrind macros above generate warnings
+# pragma GCC diagnostic pop
+#endif
+
 qint64 QBenchmarkCallgrindMeasurer::stop()
 {	
     return checkpoint();
-- 
cgit v0.12