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>
This commit is contained in:
parent
410e9cd5b1
commit
51da240149
@ -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 {
|
||||
|
@ -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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user