diff options
Diffstat (limited to 'src/corelib/text/qlocale.h')
-rw-r--r-- | src/corelib/text/qlocale.h | 20 |
1 files changed, 13 insertions, 7 deletions
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 }; |