summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Dean <ian@mediator-software.com>2012-07-18 21:05:14 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-07-27 07:46:10 (GMT)
commit23d9a022ee27ed7e8089ce0516f699a847083730 (patch)
tree2088eb10966b7ea65d2f4a609dbe51cb8ca8f9bc
parentfc2696f151f6e19ecb93589e88c7e64796a55faa (diff)
downloadQt-23d9a022ee27ed7e8089ce0516f699a847083730.zip
Qt-23d9a022ee27ed7e8089ce0516f699a847083730.tar.gz
Qt-23d9a022ee27ed7e8089ce0516f699a847083730.tar.bz2
Disable MacOSX 10.6+ locale code for iOS builds.
Change-Id: Ic2e9437aac10cb23479e8915ff6abf89d6d20169 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
-rw-r--r--src/corelib/tools/qlocale_mac.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm
index 3b93e89..e849711 100644
--- a/src/corelib/tools/qlocale_mac.mm
+++ b/src/corelib/tools/qlocale_mac.mm
@@ -345,7 +345,7 @@ static QString macFormatCurrency(const QSystemLocale::CurrencyToStringArgument &
static QVariant macQuoteString(QSystemLocale::QueryType type, const QStringRef &str)
{
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 && !defined(QT_NO_CORESERVICES)
if (QSysInfo::MacintoshVersion < QSysInfo::MV_10_6)
return QVariant();