diff options
| author | JiDe Zhang <zhangjide@uniontech.com> | 2021-03-05 13:02:39 +0800 |
|---|---|---|
| committer | JiDe Zhang <zhangjide@uniontech.com> | 2021-03-09 09:09:51 +0800 |
| commit | bc1f61d010c8e71b1b649a888951f93da0ef838a (patch) | |
| tree | 28eb3392b0bb13a435574e26661c1c08a3741054 /src | |
| parent | 065fd12f2d12765693bca6b31f0c7b6f8487bb57 (diff) | |
Update documents of QLocale::Country
Quoting from https://en.wikipedia.org/wiki/ISO_3166:
"ISO 3166 is a standard published by the International
Organization for Standardization (ISO) that defines
codes for the names of countries, dependent territories,
special areas of geographical interest, and their
principal subdivisions (e.g., provinces or states).
The official name of the standard is Codes for the
representation of names of countries and their subdivisions."
In order to prevent the word "Country" from causing ambiguity, the
document should clearly state that this enumeration refers to a country
or region.
Change-Id: I05543faa4193b3ddaf31d02c670b4b5f46e94389
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/text/qlocale.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 94564353b6..184b38c32f 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -1262,7 +1262,7 @@ QLocale::Script QLocale::script() const } /*! - Returns the country of this locale. + Returns the country or region of this locale. \sa language(), script(), countryToString(), bcp47Name() */ diff --git a/src/corelib/text/qlocale.qdoc b/src/corelib/text/qlocale.qdoc index 200f6db292..f472560d22 100644 --- a/src/corelib/text/qlocale.qdoc +++ b/src/corelib/text/qlocale.qdoc @@ -460,7 +460,7 @@ /*! \enum QLocale::Country - This enumerated type is used to specify a country. + This enumerated type is used to specify a country or a region. \value AnyCountry |