From 59fb0328392a5fc47e3a013403fe192c215d8aa7 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Wed, 7 Dec 2011 12:29:28 +0100
Subject: [PATCH] Avoid variable shadowing in qobject_impl.h

Some people like to build their Qt-based projects with -Wshadow
-Werror, and since qobject_impl.h is included from a public Qt
header, their build breaks.

Change-Id: I5d8a5ee1937092149a18c0ff66a723f5bfc9ffc3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/kernel/qobject_impl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/kernel/qobject_impl.h b/src/corelib/kernel/qobject_impl.h
index 3c7dacf527..660294b956 100644
--- a/src/corelib/kernel/qobject_impl.h
+++ b/src/corelib/kernel/qobject_impl.h
@@ -92,7 +92,7 @@ namespace QtPrivate {
     template <typename T>
     struct ApplyReturnValue {
         void *data;
-        ApplyReturnValue(void *data) : data(data) {}
+        ApplyReturnValue(void *data_) : data(data_) {}
     };
     template<typename T, typename U>
     void operator,(const T &value, const ApplyReturnValue<U> &container) {