diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-12 11:06:59 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-13 01:10:37 +0200 |
| commit | 4df73e62a70b73d955ab53faef4615ea03a21a4d (patch) | |
| tree | 00acf9163a0447da03298659bc47d2de9da509f7 /src/qml/qml/qqmlimport.cpp | |
| parent | c1821de0e6ef21f86623572fd54f5cc5451b6077 (diff) | |
Remove qSort usages from declarative
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I8fa7d0186cc8f0ba562695974829e37f1eb87f2f
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 85c6a4246a..e970ffec59 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -56,6 +56,8 @@ #include <private/qqmlengine_p.h> #include <private/qfieldlist_p.h> +#include <algorithm> + QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE) @@ -835,7 +837,7 @@ QString QQmlImportsPrivate::resolvedUri(const QString &dir_arg, QQmlImportDataba dir.chop(1); QStringList paths = database->fileImportPath; - qSort(paths.begin(), paths.end(), I::greaterThan); // Ensure subdirs preceed their parents. + std::sort(paths.begin(), paths.end(), I::greaterThan); // Ensure subdirs preceed their parents. QString stableRelativePath = dir; foreach(const QString &path, paths) { |