diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-07-29 18:51:54 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-05 20:02:58 (GMT) |
| commit | 724c52c8a12733997ba62c9fb7c9841a96a358b4 (patch) | |
| tree | 3e77fd3eb15f8f5cf688562efd743ba624125a07 | |
| parent | 47029709b61d17f2b764f5eb72a210fc7deb28ee (diff) | |
| download | Qt-724c52c8a12733997ba62c9fb7c9841a96a358b4.zip Qt-724c52c8a12733997ba62c9fb7c9841a96a358b4.tar.gz Qt-724c52c8a12733997ba62c9fb7c9841a96a358b4.tar.bz2 | |
Remove a left over cast that is now semantically incorrect.
CFPropertyListRef is a typedef for void*, which is why this code was
compiling OK prior to this change.
Change-Id: I67f2affeeb97459f85eedc8becb5d963557d34c3
(cherry-picked from qtbase commit fb25d6c7f6690402060027422343957c7d8ee718)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/tools/qlocale_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm index 6007d31..b4a0f44 100644 --- a/src/corelib/tools/qlocale_mac.mm +++ b/src/corelib/tools/qlocale_mac.mm @@ -436,7 +436,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const case CurrencyToString: return macFormatCurrency(in.value<QSystemLocale::CurrencyToStringArgument>()); case UILanguages: { - QCFType<CFPropertyListRef> languages = (CFArrayRef)CFPreferencesCopyValue( + QCFType<CFPropertyListRef> languages = CFPreferencesCopyValue( CFSTR("AppleLanguages"), kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, |