diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-22 16:35:41 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-22 16:35:43 +0200 |
| commit | 4c231d5df3040dbf4545a9a77145ee0e1f9c380c (patch) | |
| tree | 2cc5b71a5d2b464214cf5372776913fbe4622e1e /src/corelib/tools | |
| parent | 7df16fb4ccbe0476bc34274a77e98eec4e8d2d93 (diff) | |
| parent | d672ef07681a959d9559dd1e11e70db1f448a7f1 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I059725e3b7d7ffd5a16a0931e6c17200917172b5
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlocale_mac.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm index 8594cfd40d..9292dccf19 100644 --- a/src/corelib/tools/qlocale_mac.mm +++ b/src/corelib/tools/qlocale_mac.mm @@ -438,6 +438,9 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const kCFPreferencesCurrentUser, kCFPreferencesAnyHost); QStringList result; + if (!languages) + return QVariant(result); + CFTypeID typeId = CFGetTypeID(languages); if (typeId == CFArrayGetTypeID()) { const int cnt = CFArrayGetCount(languages.as<CFArrayRef>()); |