Deprecate old aliases for two countries and several languages

[ChangeLog][QtCore][QLocale] Deprecated several Language and Country
aliases, ready for removal in Qt 6.0, in favor of their newer names.

Task-number: QTBUG-84669
Change-Id: Iebaa0a5a77bfa12f7014de53fab4a25b5f1cc92c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 2c4874be40aa40b698315cac0ad768e5c650a740)
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

3 files changed, 23 insertions, 25 deletions

diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp
index 4617168781..bfd7b15e6b 100644
--- a/src/corelib/text/qlocale.cpp
+++ b/src/corelib/text/qlocale.cpp
@@ -115,22 +115,14 @@ QLocale::Language QLocalePrivate::codeToLanguage(QStringView code) noexcept
 
     if (uc3 == 0) {
         // legacy codes
-        if (uc1 == 'n' && uc2 == 'o') { // no -> nb
-            Q_STATIC_ASSERT(QLocale::Norwegian == QLocale::NorwegianBokmal);
-            return QLocale::Norwegian;
-        }
-        if (uc1 == 't' && uc2 == 'l') { // tl -> fil
-            Q_STATIC_ASSERT(QLocale::Tagalog == QLocale::Filipino);
-            return QLocale::Tagalog;
-        }
-        if (uc1 == 's' && uc2 == 'h') { // sh -> sr[_Latn]
-            Q_STATIC_ASSERT(QLocale::SerboCroatian == QLocale::Serbian);
-            return QLocale::SerboCroatian;
-        }
-        if (uc1 == 'm' && uc2 == 'o') { // mo -> ro
-            Q_STATIC_ASSERT(QLocale::Moldavian == QLocale::Romanian);
-            return QLocale::Moldavian;
-        }
+        if (uc1 == 'n' && uc2 == 'o') // no -> nb
+            return QLocale::NorwegianBokmal;
+        if (uc1 == 't' && uc2 == 'l') // tl -> fil
+            return QLocale::Filipino;
+        if (uc1 == 's' && uc2 == 'h') // sh -> sr[_Latn]
+            return QLocale::Serbian;
+        if (uc1 == 'm' && uc2 == 'o') // mo -> ro
+            return QLocale::Romanian;
         // Android uses the following deprecated codes
         if (uc1 == 'i' && uc2 == 'w') // iw -> he
             return QLocale::Hebrew;
diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h
index 64dd32cabc..036f064419 100644
--- a/src/corelib/text/qlocale.h
+++ b/src/corelib/text/qlocale.h
@@ -501,12 +501,16 @@ public:
         Chewa = Nyanja,
         Frisian = WesternFrisian,
         Kurundi = Rundi,
-        Moldavian = Romanian,
-        Norwegian = NorwegianBokmal,
+#if QT_DEPRECATED_SINCE(5, 15)
+        Moldavian Q_DECL_ENUMERATOR_DEPRECATED_X("Obsolete name, use Romanian") = Romanian,
+        Norwegian Q_DECL_ENUMERATOR_DEPRECATED_X("Obsolete name, use NorwegianBokmal") = NorwegianBokmal,
+#endif
         RhaetoRomance = Romansh,
-        SerboCroatian = Serbian,
-        Tagalog = Filipino,
-        Twi = Akan,
+#if QT_DEPRECATED_SINCE(5, 15)
+        SerboCroatian Q_DECL_ENUMERATOR_DEPRECATED_X("Obsolete name, use Serbian") = Serbian,
+        Tagalog Q_DECL_ENUMERATOR_DEPRECATED_X("Obsolete name, use Filipino") = Filipino,
+        Twi Q_DECL_ENUMERATOR_DEPRECATED_X("Obsolete name, use Akan") = Akan,
+#endif
         Uigur = Uighur,
 
         LastLanguage = NigerianPidgin
@@ -933,8 +937,10 @@ public:
         RepublicOfKorea = SouthKorea,
         RussianFederation = Russia,
         SyrianArabRepublic = Syria,
-        Tokelau = TokelauCountry,
-        Tuvalu = TuvaluCountry,
+#if QT_DEPRECATED_SINCE(5, 15)
+        Tokelau Q_DECL_ENUMERATOR_DEPRECATED_X("Obsolete name, use TokelauCountry") = TokelauCountry,
+        Tuvalu Q_DECL_ENUMERATOR_DEPRECATED_X("Obsolete name, use TuvaluCountry") = TuvaluCountry,
+#endif
 
         LastCountry = Europe
     };
diff --git a/src/corelib/text/qlocale.qdoc b/src/corelib/text/qlocale.qdoc
index 56f65766dd..f4b9f5b67d 100644
--- a/src/corelib/text/qlocale.qdoc
+++ b/src/corelib/text/qlocale.qdoc
@@ -349,9 +349,9 @@
     \value NorthernSotho
     \value NorthernThai Obsolete, no locale data available
     \value NorthNdebele
-    \value NorwegianBokmal same as Norwegian
+    \value NorwegianBokmal
     \value NorwegianNynorsk
-    \value Norwegian same as NorwegianBokmal
+    \value Norwegian Obsolete, please use NorwegianBokmal
     \value Nuer
     \value Nyanja
     \value Nyankole