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

Suppress -Wunused-const-variable in _data_p.h files

Browse Source 
... until a more robust mechanism for adding these generated tables to
the build has been found, cf. QTBUG-128930.

Task-number: QTBUG-128930
Change-Id: I190e04aba345cdd3ca6c94be6d0f7c2550362ecc
Reviewed-by: Matthias Rauter <matthias.rauter@qt.io>
(cherry picked from commit 0988042c4742a85f1ea50eb1d7acfa84ef8e83e6)
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Marc Mutz 2024-09-16 16:02:24 +02:00
parent 36fb8871d3
commit 8189baf26d
5 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/text/qlocale_data_p.h
View File

@ -35,6 +35,9 @@ struct TerritoryLanguage
quint16 territoryId;
QLocale::MeasurementSystem system;
};
QT_WARNING_PUSH // QTBUG-128930
QT_WARNING_DISABLE_CLANG("-Wunused-const-variable")
static constexpr TerritoryLanguage ImperialMeasurementSystems[] = {
{ QLocale::English, QLocale::UnitedStates, QLocale::ImperialUSSystem },
{ QLocale::English, QLocale::UnitedStatesMinorOutlyingIslands, QLocale::ImperialUSSystem },
@ -42,6 +45,7 @@ static constexpr TerritoryLanguage ImperialMeasurementSystems[] = {
{ QLocale::Hawaiian, QLocale::UnitedStates, QLocale::ImperialUSSystem },
{ QLocale::English, QLocale::UnitedKingdom, QLocale::ImperialUKSystem }
};
QT_WARNING_POP // QTBUG-128930
/*
Storage for alpha codes with length of up to 4 allowing efficient comparison.
@ -76,6 +80,9 @@ struct LanguageCodeEntry {
AlphaCode part3;
};
QT_WARNING_PUSH // QTBUG-128930
QT_WARNING_DISABLE_CLANG("-Wunused-const-variable")
// GENERATED PART STARTS HERE
/*
@ -8510,6 +8517,8 @@ static constexpr unsigned char territory_code_list[] =
// GENERATED PART ENDS HERE
QT_WARNING_POP // QTBUG-128930
QT_END_NAMESPACE
#endif

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

@ -23,6 +23,9 @@ QT_BEGIN_NAMESPACE
namespace QtPrivate::Hijri {
QT_WARNING_PUSH // QTBUG-128930
QT_WARNING_DISABLE_CLANG("-Wunused-const-variable")
// GENERATED PART STARTS HERE
/*
@ -1791,6 +1794,8 @@ static constexpr char16_t months_data[] = {
};
// GENERATED PART ENDS HERE
QT_WARNING_POP // QTBUG-128930
} // namespace QtPrivate::Hijri
QT_END_NAMESPACE

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

@ -23,6 +23,9 @@ QT_BEGIN_NAMESPACE
namespace QtPrivate::Jalali {
QT_WARNING_PUSH // QTBUG-128930
QT_WARNING_DISABLE_CLANG("-Wunused-const-variable")
// GENERATED PART STARTS HERE
/*
@ -1166,6 +1169,8 @@ static constexpr char16_t months_data[] = {
};
// GENERATED PART ENDS HERE
QT_WARNING_POP // QTBUG-128930
} // namespace QtPrivate::Jalali
QT_END_NAMESPACE

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

@ -23,6 +23,9 @@ QT_BEGIN_NAMESPACE
namespace QtPrivate::Roman {
QT_WARNING_PUSH // QTBUG-128930
QT_WARNING_DISABLE_CLANG("-Wunused-const-variable")
// GENERATED PART STARTS HERE
/*
@ -5136,6 +5139,8 @@ static constexpr char16_t months_data[] = {
};
// GENERATED PART ENDS HERE
QT_WARNING_POP // QTBUG-128930
} // namespace QtPrivate::Roman
QT_END_NAMESPACE

5
src/corelib/time/qtimezoneprivate_data_p.h
View File

@ -90,6 +90,9 @@ struct UtcData
constexpr QByteArrayView id() const; // Space-joined list of IANA IDs
};
QT_WARNING_PUSH // QTBUG-128930
QT_WARNING_DISABLE_CLANG("-Wunused-const-variable")
// GENERATED PART STARTS HERE
/*
@ -1742,6 +1745,8 @@ static constexpr char aliasIdData[] = {
};
// GENERATED PART ENDS HERE
QT_WARNING_POP // QTBUG-128930
constexpr QByteArrayView AliasData::aliasId() const { return aliasIdData + aliasIdIndex; }
constexpr QByteArrayView AliasData::ianaId() const { return aliasIdData + ianaIdIndex; }
constexpr QByteArrayView WindowsData::windowsId() const { return windowsIdData + windowsIdIndex; }