summaryrefslogtreecommitdiffstats
path: root/src/concurrent
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2013-11-04 16:20:23 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-04 22:46:13 +0100
commit0884802bb5a775e30555d21f071e12989fcba8c9 (patch)
tree68d7084ce126c8e6509f915f12b30d0b91a8bdc4 /src/concurrent
parent1d07c724317126c03ddadaed8cda2a0fcf783073 (diff)
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 <simon.hausmann@digia.com>
Diffstat (limited to 'src/concurrent')
-rw-r--r--src/concurrent/qtconcurrentmedian.h4
1 files changed, 2 insertions, 2 deletions
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<T> copy = values;
typename QVector<T>::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;
}