2 files changed, 28 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h
index d5c41d0..4af6e82 100644
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/tools/qlocale.h
@@ -372,6 +372,8 @@ public:
         LatinScript = 7,
         MongolianScript = 8,
         TifinaghScript = 9,
+        SimplifiedChineseScript = SimplifiedHanScript,
+        TraditionalChineseScript = TraditionalHanScript,
         LastScript = TifinaghScript
     };
     enum Country {
@@ -734,6 +736,7 @@ public:
     inline bool operator!=(const QLocale &other) const;
 
     static QString languageToString(Language language);
+    static QString languageToString(Language language, Script script);
     static QString countryToString(Country country);
     static QString scriptToString(Script script);
     static void setDefault(const QLocale &locale);
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc
index 4f5e0e5..253edb3 100644
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/tools/qlocale.qdoc
@@ -118,6 +118,7 @@
 
     This enumerated type is used to specify a language.
 
+    \value AnyLanguage
     \value C The "C" locale is identical in behavior to English/UnitedStates.
     \value Abkhazian
     \value Afan
@@ -340,7 +341,7 @@
     \value Shambala
     \omitvalue LastLanguage
 
-    \sa language()
+    \sa language(), languageToString()
 */
 
 /*!
@@ -598,7 +599,29 @@
     \value LatinAmericaAndTheCaribbean
     \omitvalue LastCountry
 
-    \sa country()
+    \sa country(), countryToString()
+*/
+
+/*!
+    \enum QLocale::Script
+
+    This enumerated type is used to specify a script.
+
+    \value AnyScript
+    \value ArabicScript
+    \value CyrillicScript
+    \value DeseretScript
+    \value GurmukhiScript
+    \value SimplifiedHanScript same as SimplifiedChineseScript
+    \value SimplifiedChineseScript same as SimplifiedHanScript
+    \value TraditionalHanScript same as TraditionalChineseScript
+    \value TraditionalChineseScript same as TraditionalHanScript
+    \value LatinScript
+    \value MongolianScript
+    \value TifinaghScript
+    \omitvalue LastScript
+
+    \sa script(), scriptToString(), languageToString()
 */
 
 /*!