Tidy up generation of aliases in locale-related enums

Replace lines of formatted output with dictionaries from which that
output can be generated efficiently (in sorted order).  Tidy up the
python code, in the process.

Change-Id: Ifb74eb69342646c5dbabc3247b3a8ddef602e934
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h
index e3d6c84c50..8e6c5c503b 100644
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/tools/qlocale.h
@@ -437,19 +437,19 @@ public:
         Osage = 358,
         Tangut = 359,
 
-        Norwegian = NorwegianBokmal,
-        Moldavian = Romanian,
-        SerboCroatian = Serbian,
-        Tagalog = Filipino,
-        Twi = Akan,
         Afan = Oromo,
-        Byelorussian = Belarusian,
         Bhutani = Dzongkha,
+        Byelorussian = Belarusian,
         Cambodian = Khmer,
-        Kurundi = Rundi,
-        RhaetoRomance = Romansh,
         Chewa = Nyanja,
         Frisian = WesternFrisian,
+        Kurundi = Rundi,
+        Moldavian = Romanian,
+        Norwegian = NorwegianBokmal,
+        RhaetoRomance = Romansh,
+        SerboCroatian = Serbian,
+        Tagalog = Filipino,
+        Twi = Akan,
         Uigur = Uighur,
 
         LastLanguage = Tangut
@@ -868,15 +868,15 @@ public:
         World = 260,
         Europe = 261,
 
-        Tokelau = TokelauCountry,
-        Tuvalu = TuvaluCountry,
         DemocraticRepublicOfCongo = CongoKinshasa,
-        PeoplesRepublicOfCongo = CongoBrazzaville,
         DemocraticRepublicOfKorea = NorthKorea,
+        LatinAmericaAndTheCaribbean = LatinAmerica,
+        PeoplesRepublicOfCongo = CongoBrazzaville,
         RepublicOfKorea = SouthKorea,
         RussianFederation = Russia,
         SyrianArabRepublic = Syria,
-        LatinAmericaAndTheCaribbean = LatinAmerica,
+        Tokelau = TokelauCountry,
+        Tuvalu = TuvaluCountry,
 
         LastCountry = Europe
     };