From 51da24014949868bbaffe2d98f8500eb5fcb9795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@digia.com>
Date: Mon, 16 Sep 2013 15:20:34 +0200
Subject: [PATCH] Don't use Mac OS X QCollator backend on iOS

We don't have CoreServices on iOS, which hosts the UC* APIs.

Change-Id: I95b1b173e57665c2fc2cdc1701f8ad57cdc0e567
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/corelib/tools/{qcollator_mac.cpp => qcollator_macx.cpp} | 0
 src/corelib/tools/qcollator_p.h                             | 4 ++--
 src/corelib/tools/tools.pri                                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename src/corelib/tools/{qcollator_mac.cpp => qcollator_macx.cpp} (100%)

diff --git a/src/corelib/tools/qcollator_mac.cpp b/src/corelib/tools/qcollator_macx.cpp
similarity index 100%
rename from src/corelib/tools/qcollator_mac.cpp
rename to src/corelib/tools/qcollator_macx.cpp
diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h
index 7c5f18c5b28..50e1a01f82f 100644
--- a/src/corelib/tools/qcollator_p.h
+++ b/src/corelib/tools/qcollator_p.h
@@ -47,7 +47,7 @@
 #include <QVector>
 #ifdef QT_USE_ICU
 #include <unicode/ucol.h>
-#elif defined(Q_OS_DARWIN)
+#elif defined(Q_OS_OSX)
 #include <CoreServices/CoreServices.h>
 #endif
 
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 typedef UCollator *CollatorType;
 typedef QByteArray CollatorKeyType;
 
-#elif defined(Q_OS_DARWIN)
+#elif defined(Q_OS_OSX)
 typedef QVector<UCCollationValue> CollatorKeyType;
 
 struct CollatorType {
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 01f16dc2ad8..318f84d78e3 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -150,8 +150,8 @@ contains(QT_CONFIG,icu) {
     }
 } else: win32 {
     SOURCES += tools/qcollator_win.cpp
-} else: mac {
-    SOURCES += tools/qcollator_mac.cpp
+} else: macx {
+    SOURCES += tools/qcollator_macx.cpp
 } else {
     SOURCES += tools/qcollator_posix.cpp
 }