1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtCore: Disambiguate QCalendar locale data

Browse Source 
They cause clashes in CMake Unity (Jumbo) builds.

Task-number: QTBUG-109394
Change-Id: Ib86442c2d1b9abe57d3536b7a73a5e0ce78ce18d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 8b1bb45566d55172ee248a2469e1357c3a9c843f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Friedemann Kleint 2023-01-26 15:08:13 +01:00 committed by Qt Cherry-pick Bot
parent 4a8ea3e5b2
commit b5c903c142
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/time/qhijricalendar.cpp
View File

@ -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

4
src/corelib/time/qhijricalendar_data_p.h
View File

@ -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

4
src/corelib/time/qjalalicalendar.cpp
View File

@ -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

4
src/corelib/time/qjalalicalendar_data_p.h
View File

@ -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

4
src/corelib/time/qromancalendar.cpp
View File

@ -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

4
src/corelib/time/qromancalendar_data_p.h
View File

@ -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