Merge branch 'master' into frameworks

[dolphin.git] / src / kitemviews / private / kfileitemmodelsortalgorithm.h

diff --git a/src/kitemviews/private/kfileitemmodelsortalgorithm.h b/src/kitemviews/private/kfileitemmodelsortalgorithm.h
index 278c69469f84c397c652481dd64e3d1da89ede19..3c875ce5a1528820dd43cb5c13c4eea2281f6f10 100644 (file)
--- a/src/kitemviews/private/kfileitemmodelsortalgorithm.h
+++ b/src/kitemviews/private/kfileitemmodelsortalgorithm.h
@@ -23,6 +23,7 @@
 #define KFILEITEMMODELSORTALGORITHM_H
 
 #include <QtCore>
+#include <QtConcurrent/QtConcurrent>
 
 #include <algorithm>
 
@@ -32,8 +33,6 @@
  *
  * The implementation is based on qStableSortHelper() from qalgorithms.h
  * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- * The sorting implementations of qAlgorithms could not be used as they
- * don't support having a member-function as comparison criteria.
  */
 
 template <typename RandomAccessIterator, typename LessThan>
@@ -95,8 +94,6 @@ static void parallelMergeSort(RandomAccessIterator begin,
  *
  * The implementation is based on qMerge() from qalgorithms.h
  * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- * The sorting implementations of qAlgorithms could not be used as they
- * don't support having a member-function as comparison criteria.
  */
 
 template <typename RandomAccessIterator, typename LessThan>