diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-04-20 12:04:31 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-04-21 11:46:37 +0200 |
| commit | 06d431e37f1015b91d0a6a7d9d6680f133e32c57 (patch) | |
| tree | 0946ff5d47c93f2404e8465ece035acd6950dfdc /src/corelib/text/qlocale_win.cpp | |
| parent | 4c3ec0caa839260c2252115535847b9277be32d7 (diff) | |
Rework country setting to match how we return the script setting
Change-Id: I753673ef79b4ad208fa6e0c6a4eb8139cd2ee253
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/corelib/text/qlocale_win.cpp')
| -rw-r--r-- | src/corelib/text/qlocale_win.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/text/qlocale_win.cpp b/src/corelib/text/qlocale_win.cpp index e4f845f2b2..a6582236d5 100644 --- a/src/corelib/text/qlocale_win.cpp +++ b/src/corelib/text/qlocale_win.cpp @@ -854,9 +854,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const return lang; if (type == ScriptId) return script == QLocale::AnyScript ? fallbackUiLocale().script() : script; - if (cntry == QLocale::AnyCountry) - return fallbackUiLocale().country(); - return cntry; + return cntry == QLocale::AnyCountry ? fallbackUiLocale().country() : cntry; } case MeasurementSystem: return d->measurementSystem(); |