summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2013-09-03 00:53:10 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-06 09:12:33 +0200
commitfdbabc4f03244322089d064c5e24aadedc8ecf11 (patch)
tree03b6761c29f829450e1c476901e49907f7f2105c /src/plugins/platforms/cocoa
parent2dfbf1bf038a308447d9654fc5c5cf76bf6790dc (diff)
Remove qSort usages from the Cocoa helpers
QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I482ce9320c07458a9f76df5823f17d53beec00d8 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
-rw-r--r--src/plugins/platforms/cocoa/qcocoahelpers.mm4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
index 3be294de7e..901efbfb39 100644
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -53,6 +53,8 @@
#include <QtWidgets/QWidget>
#endif
+#include <algorithm>
+
QT_BEGIN_NAMESPACE
//
@@ -320,7 +322,7 @@ QChar qt_mac_qtKey2CocoaKey(Qt::Key key)
mustInit = false;
for (int i=0; i<NumEntries; ++i)
rev_entries[i] = entries[i];
- qSort(rev_entries.begin(), rev_entries.end(), qtKey2CocoaKeySortLessThan);
+ std::sort(rev_entries.begin(), rev_entries.end(), qtKey2CocoaKeySortLessThan);
}
const QVector<KeyPair>::iterator i
= qBinaryFind(rev_entries.begin(), rev_entries.end(), key);