summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qlocale.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/tools/qlocale.qdoc')
-rw-r--r--src/corelib/tools/qlocale.qdoc81
1 files changed, 73 insertions, 8 deletions
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc
index c87e67cf17..f4b49095df 100644
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/tools/qlocale.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -92,7 +92,7 @@
\note For the current keyboard input locale take a look at
QInputMethod::locale().
- QLocale's data is based on Common Locale Data Repository v27.
+ QLocale's data is based on Common Locale Data Repository v29.
The double-to-string and string-to-double conversion functions are
covered by the following licenses:
@@ -483,6 +483,26 @@
\value Maithili Since Qt 5.5
\value LowerSorbian Since Qt 5.5
\value UpperSorbian Since Qt 5.5
+ \value Ahom Since Qt 5.7
+ \value AmericanSignLanguage Since Qt 5.7
+ \value ArdhamagadhiPrakrit Since Qt 5.7
+ \value Bhojpuri Since Qt 5.7
+ \value Cantonese Since Qt 5.7
+ \value HieroglyphicLuwian Since Qt 5.7
+ \value LiteraryChinese Since Qt 5.7
+ \value Mazanderani Since Qt 5.7
+ \value Mru Since Qt 5.7
+ \value Newari Since Qt 5.7
+ \value NorthernLuri Since Qt 5.7
+ \value Osage Since Qt 5.7
+ \value Palauan Since Qt 5.7
+ \value Papiamento Since Qt 5.7
+ \value Saraiki Since Qt 5.7
+ \value Tangut Since Qt 5.7
+ \value TokelauLanguage Since Qt 5.7
+ \value TokPisin Since Qt 5.7
+ \value TuvaluLanguage Since Qt 5.7
+ \value UncodedLanguages Since Qt 5.7
\omitvalue LastLanguage
\sa language(), languageToString()
@@ -567,6 +587,7 @@
\value Eritrea
\value Estonia
\value Ethiopia
+ \value EuropeanUnion Since Qt 5.7
\value FalklandIslands
\value FaroeIslands
\value Fiji
@@ -662,6 +683,7 @@
\value NorthernMarianaIslands
\value Norway
\value Oman
+ \value OutlyingOceania Since Qt 5.7
\value Pakistan
\value Palau
\value PalestinianTerritories
@@ -714,14 +736,16 @@
\value Tanzania
\value Thailand
\value Togo
- \value Tokelau
+ \value TokelauCountry
+ \value Tokelau Obsolete, please use TokelauCountry
\value Tonga
\value TrinidadAndTobago
\value Tunisia
\value Turkey
\value Turkmenistan
\value TurksAndCaicosIslands
- \value Tuvalu
+ \value TuvaluCountry
+ \value Tuvalu Obsolete, please use TuvaluCountry
\value Uganda
\value Ukraine
\value UnitedArabEmirates
@@ -768,6 +792,9 @@
This enumerated type is used to specify a script.
\value AnyScript
+ \value AdlamScript Since Qt 5.7
+ \value AhomScript Since Qt 5.7
+ \value AnatolianHieroglyphsScript Since Qt 5.7
\value ArabicScript
\value ArmenianScript
\value AvestanScript
@@ -776,6 +803,7 @@
\value BassaVahScript Since Qt 5.5
\value BatakScript
\value BengaliScript
+ \value BhaiksukiScript Since Qt 5.7
\value BopomofoScript
\value BrahmiScript
\value BrailleScript
@@ -807,11 +835,14 @@
\value HanScript
\value HangulScript
\value HanunooScript
+ \value HanWithBopomofoScript Since Qt 5.7
+ \value HatranScript Since Qt 5.7
\value HebrewScript
\value HiraganaScript
\value ImperialAramaicScript
\value InscriptionalPahlaviScript
\value InscriptionalParthianScript
+ \value JamoScript Since Qt 5.7
\value JapaneseScript
\value JavaneseScript
\value KaithiScript
@@ -836,6 +867,7 @@
\value MalayalamScript
\value MandaeanScript
\value ManichaeanScript Since Qt 5.5
+ \value MarchenScript Since Qt 5.7
\value MeiteiMayekScript
\value MendeKikakuiScript Since Qt 5.5
\value MeroiticScript
@@ -843,19 +875,23 @@
\value ModiScript Since Qt 5.5
\value MongolianScript
\value MroScript Since Qt 5.5
+ \value MultaniScript Since Qt 5.7
\value MyanmarScript
\value NabataeanScript Since Qt 5.5
\value NkoScript
+ \value NewaScript Since Qt 5.7
\value NewTaiLueScript
\value OghamScript
\value OlChikiScript
\value OldItalicScript
+ \value OldHungarianScript Since Qt 5.7
\value OldNorthArabianScript Since Qt 5.5
\value OldPermicScript Since Qt 5.5
\value OldPersianScript
\value OldSouthArabianScript
\value OriyaScript
\value OrkhonScript
+ \value OsageScript Since Qt 5.7
\value OsmanyaScript
\value PahawhHmongScript Since Qt 5.5
\value PalmyreneScript Since Qt 5.5
@@ -871,6 +907,7 @@
\value SharadaScript
\value ShavianScript
\value SiddhamScript Since Qt 5.5
+ \value SignWritingScript Since Qt 5.7
\value SimplifiedHanScript same as SimplifiedChineseScript
\value SimplifiedChineseScript same as SimplifiedHanScript
\value SinhalaScript
@@ -885,6 +922,7 @@
\value TaiVietScript
\value TakriScript
\value TamilScript
+ \value TangutScript Since Qt 5.7
\value TeluguScript
\value ThaanaScript
\value ThaiScript
@@ -930,17 +968,44 @@
conversions. They can be retrieved with numberOptions() and set with
setNumberOptions().
+ \value DefaultNumberOptions This option represents the default behavior, with
+ group separators and with one leading zero in single digit exponents.
\value OmitGroupSeparator If this option is set, the number-to-string functions
will not insert group separators in their return values. The default
is to insert group separators.
\value RejectGroupSeparator If this option is set, the string-to-number functions
will fail if they encounter group separators in their input. The default
is to accept numbers containing correctly placed group separators.
+ \value OmitLeadingZeroInExponent If this option is set, the number-to-string
+ functions will not pad exponents with zeroes when printing floating point
+ numbers in scientific notation. The default is to add one leading zero to
+ single digit exponents.
+ \value RejectLeadingZeroInExponent If this option is set, the string-to-number
+ functions will fail if they encounter an exponent padded with zeroes when
+ parsing a floating point number in scientific notation. The default is to
+ accept such padding.
\sa setNumberOptions(), numberOptions()
*/
/*!
+ \enum QLocale::FloatingPointPrecisionOption
+
+ This enum defines constants that can be given as precision to QString::number(),
+ QByteArray::number(), and QLocale::toString() when converting floats or doubles,
+ in order to express a variable number of digits as precision.
+
+ \value FloatingPointShortest The conversion algorithm will try to find the
+ shortest accurate representation for the given number. "Accurate" means
+ that you get the exact same number back from an inverse conversion on
+ the generated string representation.
+
+ \sa toString(), QString, QByteArray
+
+ \since 5.7
+*/
+
+/*!
\enum QLocale::MeasurementSystem
This enum defines which units are used for measurement.