diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2009-06-11 14:27:29 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2009-06-11 14:27:29 (GMT) |
| commit | aa2adb8d0072eccb549692d56168b8fde33f7b4f (patch) | |
| tree | 243131860f54393cf40cd9648043cffd3db6b874 | |
| parent | e3d6bd3fc41b09c2eb7c56789d7dc5e26722a3b9 (diff) | |
| download | Qt-aa2adb8d0072eccb549692d56168b8fde33f7b4f.zip Qt-aa2adb8d0072eccb549692d56168b8fde33f7b4f.tar.gz Qt-aa2adb8d0072eccb549692d56168b8fde33f7b4f.tar.bz2 | |
Sort QDir with qSort instead of qStableSort
The commit 3e7fc907e5cc1937fb98bf4581cee960fe3d4e7a have changed the
behavior of sorting of QDir. This revert to the old behavior with
qSort instead of qStableSort.
Reviewed-by: Alexis
| -rw-r--r-- | src/corelib/io/qdir.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 302d9b5..b6900bc 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -289,7 +289,7 @@ inline void QDirPrivate::sortFileList(QDir::SortFlags sort, QFileInfoList &l, QDirSortItem *si = new QDirSortItem[n]; for (int i = 0; i < n; ++i) si[i].item = l.at(i); - qStableSort(si, si + n, QDirSortItemComparator(sort)); + qSort(si, si+n, QDirSortItemComparator(sort)); // put them back in the list(s) if(infos) { for (int i = 0; i < n; ++i) @@ -1316,7 +1316,6 @@ QStringList QDir::entryList(Filters filters, SortFlags sort) const \sa entryList(), setNameFilters(), setSorting(), setFilter(), isReadable(), exists() */ - QFileInfoList QDir::entryInfoList(Filters filters, SortFlags sort) const { Q_D(const QDir); |