diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-07 08:34:53 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-07 08:34:53 +0100 |
| commit | 75391511ff75d6999822cda9f699da585f49ad37 (patch) | |
| tree | 566dbd70ca624e733025a68612a95aaade463bba /src/corelib/text/qlocale.qdoc | |
| parent | fd9b0b86bb5f78ffa855409c4dd5976505ef83f5 (diff) | |
| parent | 68c30e372b01561e8809fcfa5426ae896da70b8e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia2ce994c42adc010c453edaeea57f672556958f6
Diffstat (limited to 'src/corelib/text/qlocale.qdoc')
| -rw-r--r-- | src/corelib/text/qlocale.qdoc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/corelib/text/qlocale.qdoc b/src/corelib/text/qlocale.qdoc index 6c9d6f9d11..592f9d0785 100644 --- a/src/corelib/text/qlocale.qdoc +++ b/src/corelib/text/qlocale.qdoc @@ -174,7 +174,7 @@ \value Chewa Obsolete, please use Nyanja \value Chickasaw Since Qt 5.14 \value Chiga - \value Chinese + \value Chinese (Mandarin) \value Church \value Chuvash \value ClassicalMandaic Since Qt 5.1 @@ -1202,14 +1202,6 @@ */ /*! -\fn QString QLocale::toString(ushort i) const - -\overload - -\sa toUShort() -*/ - -/*! \fn QString QLocale::toString(int i) const \overload |