diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-09-26 10:29:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 15:35:52 +0200 |
| commit | abe229291b292e1e5d0d07b23c130991b347ae78 (patch) | |
| tree | aec73ea8efed8312e793c65b204cdc223fcca8d3 /src/script | |
| parent | eff4a0f3fca2e22d4be888cdd7953e1c2ab8c918 (diff) | |
| download | qtscript-abe229291b292e1e5d0d07b23c130991b347ae78.tar.gz | |
Remove QtAlgorithms usage from QtScript.
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: If4dc8f69fd75315390a4850be732715064f5fdd8
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index cefcd50..4c7670d 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -42,6 +42,7 @@ #include <QtCore/qmetaobject.h> #include <math.h> +#include <algorithm> #include "CodeBlock.h" #include "Error.h" @@ -3849,7 +3850,7 @@ QStringList QScriptEngine::availableExtensions() const } QStringList lst = result.toList(); - qSort(lst); + std::sort(lst.begin(), lst.end()); return lst; #endif } @@ -3866,7 +3867,7 @@ QStringList QScriptEngine::importedExtensions() const { Q_D(const QScriptEngine); QStringList lst = d->importedExtensions.toList(); - qSort(lst); + std::sort(lst.begin(), lst.end()); return lst; } |