diff options
author | David Faure <faure@kde.org> | 2011-11-03 23:22:43 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-04 15:58:17 +0100 |
commit | 480c1db1ba1743741cae6b0ef9b6afd733f765df (patch) | |
tree | f2408c236a9bf2e48d25deeee9e2e2cb31e1f655 | |
parent | 5a67cd24955da6c3ac27cbbd5e08cf9ce9fa88b9 (diff) |
Fix usage of QtConcurrent headers with -Wshadow -Werror
Change-Id: I172888518a3db01f89e61061eccf85f7f3387d07
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
-rw-r--r-- | src/corelib/concurrent/qtconcurrentrunbase.h | 4 |
1 files changed, 2 insertions, 2 deletions
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() {} |