From abe229291b292e1e5d0d07b23c130991b347ae78 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 26 Sep 2013 10:29:45 +0200 Subject: Remove QtAlgorithms usage from QtScript. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: If4dc8f69fd75315390a4850be732715064f5fdd8 Reviewed-by: Jędrzej Nowacki Reviewed-by: Giuseppe D'Angelo --- src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp') diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp index c8a048a..e6866b4 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp +++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp @@ -56,6 +56,8 @@ #include #include +#include + Q_DECLARE_METATYPE(QScriptScriptsDelta) Q_DECLARE_METATYPE(QScriptDebuggerValueProperty) Q_DECLARE_METATYPE(QScriptDebuggerValuePropertyList) @@ -399,7 +401,7 @@ QScriptDebuggerResponse QScriptDebuggerCommandExecutor::execute( } } QStringList matchesList = matches.toList(); - qStableSort(matchesList); + std::stable_sort(matchesList.begin(), matchesList.end()); response.setResult(matchesList); } break; -- cgit v1.2.1