1 files changed, 61 insertions, 12 deletions

diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h
index f965ae6562..61574ba44f 100644
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/tools/qlocale.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** 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.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -55,9 +55,6 @@ class QLocalePrivate;
 class Q_CORE_EXPORT QLocale
 {
     Q_GADGET
-    Q_ENUMS(Language)
-    Q_ENUMS(Country)
-    Q_ENUMS(MeasurementSystem)
     friend class QString;
     friend class QStringRef;
     friend class QByteArray;
@@ -385,6 +382,31 @@ public:
         Akoose = 312,
         Lakota = 313,
         StandardMoroccanTamazight = 314,
+        Mapuche = 315,
+        CentralKurdish = 316,
+        LowerSorbian = 317,
+        UpperSorbian = 318,
+        Kenyang = 319,
+        Mohawk = 320,
+        Nko = 321,
+        Prussian = 322,
+        Kiche = 323,
+        SouthernSami = 324,
+        LuleSami = 325,
+        InariSami = 326,
+        SkoltSami = 327,
+        Warlpiri = 328,
+        ManichaeanMiddlePersian = 329,
+        Mende = 330,
+        AncientNorthArabian = 331,
+        LinearA = 332,
+        HmongNjua = 333,
+        Ho = 334,
+        Lezghian = 335,
+        Bassa = 336,
+        Mono = 337,
+        TedimChin = 338,
+        Maithili = 339,
         Norwegian = NorwegianBokmal,
         Moldavian = Romanian,
         SerboCroatian = Serbian,
@@ -399,7 +421,7 @@ public:
         Chewa = Nyanja,
         Frisian = WesternFrisian,
         Uigur = Uighur,
-        LastLanguage = StandardMoroccanTamazight
+        LastLanguage = Maithili
     };
 
     enum Script {
@@ -508,9 +530,32 @@ public:
         UgariticScript = 102,
         BrailleScript = 103,
         HiraganaScript = 104,
+        CaucasianAlbanianScript = 105,
+        BassaVahScript = 106,
+        DuployanScript = 107,
+        ElbasanScript = 108,
+        GranthaScript = 109,
+        PahawhHmongScript = 110,
+        KhojkiScript = 111,
+        LinearAScript = 112,
+        MahajaniScript = 113,
+        ManichaeanScript = 114,
+        MendeKikakuiScript = 115,
+        ModiScript = 116,
+        MroScript = 117,
+        OldNorthArabianScript = 118,
+        NabataeanScript = 119,
+        PalmyreneScript = 120,
+        PauCinHauScript = 121,
+        OldPermicScript = 122,
+        PsalterPahlaviScript = 123,
+        SiddhamScript = 124,
+        KhudawadiScript = 125,
+        TirhutaScript = 126,
+        VarangKshitiScript = 127,
         SimplifiedChineseScript = SimplifiedHanScript,
         TraditionalChineseScript = TraditionalHanScript,
-        LastScript = HiraganaScript
+        LastScript = VarangKshitiScript
     };
     enum Country {
         AnyCountry = 0,
@@ -781,12 +826,16 @@ public:
     };
 // GENERATED PART ENDS HERE
 
+    Q_ENUM(Language)
+    Q_ENUM(Country)
+
     enum MeasurementSystem {
         MetricSystem,
         ImperialUSSystem,
         ImperialUKSystem,
         ImperialSystem = ImperialUSSystem // Qt 4 compatibility
     };
+    Q_ENUM(MeasurementSystem)
 
     enum FormatType { LongFormat, ShortFormat, NarrowFormat };
     enum NumberOption {