1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use Mac OS X QCollator backend on iOS

Browse Source 
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:
Tor Arne Vestbø 2013-09-16 15:20:34 +02:00 committed by The Qt Project
parent 410e9cd5b1
commit 51da240149
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/corelib/tools/qcollator_mac.cpp → src/corelib/tools/qcollator_macx.cpp
View File

4
src/corelib/tools/qcollator_p.h
View File

@ -47,7 +47,7 @@
#include <QVector> #include <QVector>
#ifdef QT_USE_ICU #ifdef QT_USE_ICU
#include <unicode/ucol.h> #include <unicode/ucol.h>
#elif defined(Q_OS_DARWIN) #elif defined(Q_OS_OSX)
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#endif #endif
@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
typedef UCollator *CollatorType; typedef UCollator *CollatorType;
typedef QByteArray CollatorKeyType; typedef QByteArray CollatorKeyType;
#elif defined(Q_OS_DARWIN) #elif defined(Q_OS_OSX)
typedef QVector<UCCollationValue> CollatorKeyType; typedef QVector<UCCollationValue> CollatorKeyType;
struct CollatorType { struct CollatorType {

4
src/corelib/tools/tools.pri
View File

@ -150,8 +150,8 @@ contains(QT_CONFIG,icu) {
} }
} else: win32 { } else: win32 {
SOURCES += tools/qcollator_win.cpp SOURCES += tools/qcollator_win.cpp
} else: mac { } else: macx {
SOURCES += tools/qcollator_mac.cpp SOURCES += tools/qcollator_macx.cpp
} else { } else {
SOURCES += tools/qcollator_posix.cpp SOURCES += tools/qcollator_posix.cpp
} }