From 480c1db1ba1743741cae6b0ef9b6afd733f765df Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Thu, 3 Nov 2011 23:22:43 +0100
Subject: Fix usage of QtConcurrent headers with -Wshadow -Werror

Change-Id: I172888518a3db01f89e61061eccf85f7f3387d07
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
---
 src/corelib/concurrent/qtconcurrentrunbase.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/corelib/concurrent')

diff --git a/src/corelib/concurrent/qtconcurrentrunbase.h b/src/corelib/concurrent/qtconcurrentrunbase.h
index 22ea0da55d..c1270e953b 100644
--- a/src/corelib/concurrent/qtconcurrentrunbase.h
+++ b/src/corelib/concurrent/qtconcurrentrunbase.h
@@ -81,9 +81,9 @@ public:
     {
         this->setRunnable(this);
         this->reportStarted();
-        QFuture<T> future = this->future();
+        QFuture<T> theFuture = this->future();
         QThreadPool::globalInstance()->start(this, /*m_priority*/ 0);
-        return future;
+        return theFuture;
     }
 
     void run() {}
-- 
cgit v1.2.3