From 0884802bb5a775e30555d21f071e12989fcba8c9 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 4 Nov 2013 16:20:23 +0100 Subject: Revert "QtConcurrent::Median: add some qMove()" This reverts commit 12bd604f241d41d52ab3fde9f4a8f4f5c2f3fa6d. This causes problems in QtCreator without anyone being able to say why. Task-number: QTBUG-34397 Change-Id: I7733c3db7d35bba2734e128476aabcb0152a91e4 Reviewed-by: Simon Hausmann --- src/concurrent/qtconcurrentmedian.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/concurrent/qtconcurrentmedian.h') diff --git a/src/concurrent/qtconcurrentmedian.h b/src/concurrent/qtconcurrentmedian.h index 29342e6402..b39b3ed32b 100644 --- a/src/concurrent/qtconcurrentmedian.h +++ b/src/concurrent/qtconcurrentmedian.h @@ -90,7 +90,7 @@ public: dirty = true; } - values[currentIndex] = qMove(value); + values[currentIndex] = value; } bool isMedianValid() const @@ -105,7 +105,7 @@ public: QVector copy = values; typename QVector::iterator begin = copy.begin(), mid = copy.begin() + bufferSize/2, end = copy.end(); std::nth_element(begin, mid, end); - currentMedian = qMove(*mid); + currentMedian = *mid; } return currentMedian; } -- cgit v1.2.3