From 10e690506e80fb9dbb5f1f0baa2241693699bffb Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Mon, 2 Sep 2013 23:33:17 +0200 Subject: Remove qSort usage from rcc QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I09dc82b7f9509f73c7b8b9c16a08fefb8ca0b8a5 Reviewed-by: hjk --- src/tools/rcc/rcc.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/tools/rcc') diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index 1d36647b6a..cd9fe2ac86 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -52,6 +52,8 @@ #include #include +#include + // Note: A copy of this file is used in Qt Designer (qttools/src/designer/src/lib/shared/rcc.cpp) QT_BEGIN_NAMESPACE @@ -905,7 +907,7 @@ bool RCCResourceLibrary::writeDataStructure() //sort by hash value for binary lookup QList m_children = file->m_children.values(); - qSort(m_children.begin(), m_children.end(), qt_rcc_compare_hash); + std::sort(m_children.begin(), m_children.end(), qt_rcc_compare_hash); //write out the actual data now for (int i = 0; i < m_children.size(); ++i) { @@ -924,7 +926,7 @@ bool RCCResourceLibrary::writeDataStructure() //sort by hash value for binary lookup QList m_children = file->m_children.values(); - qSort(m_children.begin(), m_children.end(), qt_rcc_compare_hash); + std::sort(m_children.begin(), m_children.end(), qt_rcc_compare_hash); //write out the actual data now for (int i = 0; i < m_children.size(); ++i) { -- cgit v1.2.3