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/scripttools/debugging/qscriptdebuggerconsolewidget.cpp | |
| 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/scripttools/debugging/qscriptdebuggerconsolewidget.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp index 78bb5fc..55cfc2e 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp @@ -54,6 +54,8 @@ #include <QtWidgets/qboxlayout.h> #include <QtWidgets/qcompleter.h> +#include <algorithm> + QT_BEGIN_NAMESPACE namespace { @@ -277,7 +279,7 @@ void QScriptDebuggerConsoleWidgetPrivate::_q_onCompletionTaskFinished() QStringList lst; for (int i = 0; i < task->resultCount(); ++i) lst.append(task->resultAt(i).mid(task->length())); - qSort(lst.begin(), lst.end(), lengthLessThan); + std::sort(lst.begin(), lst.end(), lengthLessThan); QString lcp = longestCommonPrefix(lst); if (!lcp.isEmpty()) { QString tmp = commandLine->input(); |