diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
| commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
| tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/concurrent/qtconcurrentiteratekernel.h | |
| parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
| parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/concurrent/qtconcurrentiteratekernel.h')
| -rw-r--r-- | src/concurrent/qtconcurrentiteratekernel.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h index 70a7f161de8..b47c30aef6c 100644 --- a/src/concurrent/qtconcurrentiteratekernel.h +++ b/src/concurrent/qtconcurrentiteratekernel.h @@ -59,8 +59,6 @@ QT_BEGIN_NAMESPACE namespace QtConcurrent { - using std::advance; - /* The BlockSizeManager class manages how many iterations a thread should reserve and process at a time. This is done by measuring the time spent |