diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-09-16 15:20:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-16 23:19:06 +0200 |
| commit | 51da24014949868bbaffe2d98f8500eb5fcb9795 (patch) | |
| tree | a153bf3788dd685efccf734fa9636cf0dc67ab35 /src/corelib | |
| parent | 410e9cd5b1a6eb87f150f058062087756d52ec25 (diff) | |
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>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qcollator_macx.cpp (renamed from src/corelib/tools/qcollator_mac.cpp) | 0 | ||||
| -rw-r--r-- | src/corelib/tools/qcollator_p.h | 4 | ||||
| -rw-r--r-- | src/corelib/tools/tools.pri | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qcollator_mac.cpp b/src/corelib/tools/qcollator_macx.cpp index 8edd190fbe..8edd190fbe 100644 --- a/src/corelib/tools/qcollator_mac.cpp +++ b/src/corelib/tools/qcollator_macx.cpp diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h index 7c5f18c5b2..50e1a01f82 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 01f16dc2ad..318f84d78e 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 } |