From 8189baf26d9b1109b956f13887f3a3a9fbf81c03 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 16 Sep 2024 16:02:24 +0200 Subject: [PATCH] Suppress -Wunused-const-variable in _data_p.h files ... 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 (cherry picked from commit 0988042c4742a85f1ea50eb1d7acfa84ef8e83e6) Reviewed-by: Edward Welbourne --- src/corelib/text/qlocale_data_p.h | 9 +++++++++ src/corelib/time/qhijricalendar_data_p.h | 5 +++++ src/corelib/time/qjalalicalendar_data_p.h | 5 +++++ src/corelib/time/qromancalendar_data_p.h | 5 +++++ src/corelib/time/qtimezoneprivate_data_p.h | 5 +++++ 5 files changed, 29 insertions(+) diff --git a/src/corelib/text/qlocale_data_p.h b/src/corelib/text/qlocale_data_p.h index 835b10f05d0..6c6936b61ce 100644 --- a/src/corelib/text/qlocale_data_p.h +++ b/src/corelib/text/qlocale_data_p.h @@ -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 diff --git a/src/corelib/time/qhijricalendar_data_p.h b/src/corelib/time/qhijricalendar_data_p.h index 4cebcf4da7f..34ccdeca1ce 100644 --- a/src/corelib/time/qhijricalendar_data_p.h +++ b/src/corelib/time/qhijricalendar_data_p.h @@ -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 diff --git a/src/corelib/time/qjalalicalendar_data_p.h b/src/corelib/time/qjalalicalendar_data_p.h index 213b8000358..a270b393777 100644 --- a/src/corelib/time/qjalalicalendar_data_p.h +++ b/src/corelib/time/qjalalicalendar_data_p.h @@ -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 diff --git a/src/corelib/time/qromancalendar_data_p.h b/src/corelib/time/qromancalendar_data_p.h index 43953c55bba..5fbf29cd9cf 100644 --- a/src/corelib/time/qromancalendar_data_p.h +++ b/src/corelib/time/qromancalendar_data_p.h @@ -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 diff --git a/src/corelib/time/qtimezoneprivate_data_p.h b/src/corelib/time/qtimezoneprivate_data_p.h index a1c553090df..d56ba77a6a0 100644 --- a/src/corelib/time/qtimezoneprivate_data_p.h +++ b/src/corelib/time/qtimezoneprivate_data_p.h @@ -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; }