From 8b1bb45566d55172ee248a2469e1357c3a9c843f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 26 Jan 2023 15:08:13 +0100
Subject: [PATCH] QtCore: Disambiguate QCalendar locale data

They cause clashes in CMake Unity (Jumbo) builds.

Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Ib86442c2d1b9abe57d3536b7a73a5e0ce78ce18d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/time/qhijricalendar.cpp       | 4 ++--
 src/corelib/time/qhijricalendar_data_p.h  | 4 ++++
 src/corelib/time/qjalalicalendar.cpp      | 4 ++--
 src/corelib/time/qjalalicalendar_data_p.h | 4 ++++
 src/corelib/time/qromancalendar.cpp       | 4 ++--
 src/corelib/time/qromancalendar_data_p.h  | 4 ++++
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/corelib/time/qhijricalendar.cpp b/src/corelib/time/qhijricalendar.cpp
index b605c3e811..3d5a97c310 100644
--- a/src/corelib/time/qhijricalendar.cpp
+++ b/src/corelib/time/qhijricalendar.cpp
@@ -79,12 +79,12 @@ int QHijriCalendar::daysInYear(int year) const
 
 const QCalendarLocale *QHijriCalendar::localeMonthIndexData() const
 {
-    return locale_data;
+    return QtPrivate::Hijri::locale_data;
 }
 
 const char16_t *QHijriCalendar::localeMonthData() const
 {
-    return months_data;
+    return QtPrivate::Hijri::months_data;
 }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/time/qhijricalendar_data_p.h b/src/corelib/time/qhijricalendar_data_p.h
index 87986eec9a..fc345ac835 100644
--- a/src/corelib/time/qhijricalendar_data_p.h
+++ b/src/corelib/time/qhijricalendar_data_p.h
@@ -20,6 +20,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtPrivate::Hijri {
+
 // GENERATED PART STARTS HERE
 
 /*
@@ -1254,6 +1256,8 @@ static constexpr char16_t months_data[] = {
 };
 // GENERATED PART ENDS HERE
 
+} // namespace QtPrivate::Hijri
+
 QT_END_NAMESPACE
 
 #endif // QHIJRI_CALENDAR_DATA_P_H
diff --git a/src/corelib/time/qjalalicalendar.cpp b/src/corelib/time/qjalalicalendar.cpp
index 0b51211d15..f33e9f3097 100644
--- a/src/corelib/time/qjalalicalendar.cpp
+++ b/src/corelib/time/qjalalicalendar.cpp
@@ -162,12 +162,12 @@ int QJalaliCalendar::daysInMonth(int month, int year) const
 
 const QCalendarLocale *QJalaliCalendar::localeMonthIndexData() const
 {
-    return locale_data;
+    return QtPrivate::Jalali::locale_data;
 }
 
 const char16_t *QJalaliCalendar::localeMonthData() const
 {
-    return months_data;
+    return QtPrivate::Jalali::months_data;
 }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/time/qjalalicalendar_data_p.h b/src/corelib/time/qjalalicalendar_data_p.h
index 176e10b31d..dd39350bf0 100644
--- a/src/corelib/time/qjalalicalendar_data_p.h
+++ b/src/corelib/time/qjalalicalendar_data_p.h
@@ -20,6 +20,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtPrivate::Jalali {
+
 // GENERATED PART STARTS HERE
 
 /*
@@ -905,6 +907,8 @@ static constexpr char16_t months_data[] = {
 };
 // GENERATED PART ENDS HERE
 
+} // namespace QtPrivate::Jalali
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/corelib/time/qromancalendar.cpp b/src/corelib/time/qromancalendar.cpp
index 3cecadafa2..0a7399ea51 100644
--- a/src/corelib/time/qromancalendar.cpp
+++ b/src/corelib/time/qromancalendar.cpp
@@ -57,12 +57,12 @@ bool QRomanCalendar::isSolar() const
 
 const QCalendarLocale *QRomanCalendar::localeMonthIndexData() const
 {
-    return locale_data;
+    return QtPrivate::Roman::locale_data;
 }
 
 const char16_t *QRomanCalendar::localeMonthData() const
 {
-    return months_data;
+    return QtPrivate::Roman::months_data;
 }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/time/qromancalendar_data_p.h b/src/corelib/time/qromancalendar_data_p.h
index 9d77881672..40d99cd031 100644
--- a/src/corelib/time/qromancalendar_data_p.h
+++ b/src/corelib/time/qromancalendar_data_p.h
@@ -20,6 +20,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtPrivate::Roman {
+
 // GENERATED PART STARTS HERE
 
 /*
@@ -2743,6 +2745,8 @@ static constexpr char16_t months_data[] = {
 };
 // GENERATED PART ENDS HERE
 
+} // namespace QtPrivate::Roman
+
 QT_END_NAMESPACE
 
 #endif