diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-25 14:20:33 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-08-25 16:08:09 +0000 |
| commit | 13680ceb9a468f824e24e448e932eed3a4ad9007 (patch) | |
| tree | 5b8441f3cfc6e2e012172795b9a83f0adc8798fc /src/corelib/tools | |
| parent | 095abb192577d61215fcf7ea3a55338c54a3c4b0 (diff) | |
| parent | c7cdf3aac7ef9571ce0c0cf25a2c8455c7604451 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlocale_win.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/tools/qlocale_win.cpp index 88bfada515..9d2db61a11 100644 --- a/src/corelib/tools/qlocale_win.cpp +++ b/src/corelib/tools/qlocale_win.cpp @@ -848,7 +848,6 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const case ZeroDigit: return d->zeroDigit(); case LanguageId: - case ScriptId: case CountryId: { QString locale = QString::fromLatin1(getWinLocaleName()); QLocale::Language lang; @@ -857,12 +856,12 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const QLocalePrivate::getLangAndCountry(locale, lang, script, cntry); if (type == LanguageId) return lang; - if (type == ScriptId) - return script == QLocale::AnyScript ? fallbackUiLocale().script() : script; if (cntry == QLocale::AnyCountry) return fallbackUiLocale().country(); return cntry; } + case ScriptId: + return QVariant(QLocale::AnyScript); case MeasurementSystem: return d->measurementSystem(); case AMText: |