Update QTimeZone benchmark's list of tested zones
It purports to be a list of those named in QDateTime's tests, but was a bit out of date. In the process, sort them into somewhat coherent order (to make it easier to verify whether one is missing next time I check) and reformat. Change-Id: I16e7ded6f8b00e226513bd06d6174a79f7a0c675 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 0ed89870788f28daf1504a6204343d6b158b2cf3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
b000770c20
commit
70783deaa1
@ -35,15 +35,22 @@ static QList<QByteArray> enoughZones()
|
|||||||
for (conat auto &name : available)
|
for (conat auto &name : available)
|
||||||
result << name;
|
result << name;
|
||||||
#else
|
#else
|
||||||
QList<QByteArray> result { QByteArray("UTC"),
|
QList<QByteArray> result {
|
||||||
// Those named overtly in tst_QDateTime:
|
QByteArray("UTC"),
|
||||||
QByteArray("Europe/Oslo"), QByteArray("America/Vancouver"),
|
// Those named overtly in tst_QDateTime - special cases first:
|
||||||
QByteArray("Europe/Berlin"), QByteArray("America/Sao_Paulo"),
|
QByteArray("UTC-02:00"), QByteArray("UTC+02:00"), QByteArray("UTC+12:00"),
|
||||||
QByteArray("Pacific/Auckland"), QByteArray("Australia/Eucla"),
|
QByteArray("Etc/GMT+3"), QByteArray("GMT-2"), QByteArray("GMT"),
|
||||||
QByteArray("Asia/Kathmandu"), QByteArray("Pacific/Kiritimati"),
|
// ... then ordinary names in alphabetic order:
|
||||||
QByteArray("Pacific/Apia"), QByteArray("UTC+12:00"),
|
QByteArray("America/New_York"), QByteArray("America/Sao_Paulo"),
|
||||||
QByteArray("Australia/Sydney"), QByteArray("Asia/Singapore"),
|
QByteArray("America/Vancouver"),
|
||||||
QByteArray("Australia/Brisbane") };
|
QByteArray("Asia/Kathmandu"), QByteArray("Asia/Singapore"),
|
||||||
|
QByteArray("Australia/Brisbane"), QByteArray("Australia/Eucla"),
|
||||||
|
QByteArray("Australia/Sydney"),
|
||||||
|
QByteArray("Europe/Berlin"), QByteArray("Europe/Helsinki"),
|
||||||
|
QByteArray("Europe/Rome"), QByteArray("Europe/Oslo"),
|
||||||
|
QByteArray("Pacific/Apia"), QByteArray("Pacific/Auckland"),
|
||||||
|
QByteArray("Pacific/Kiritimati")
|
||||||
|
};
|
||||||
#endif
|
#endif
|
||||||
result << QByteArray("Vulcan/ShiKahr"); // invalid: also worth testing
|
result << QByteArray("Vulcan/ShiKahr"); // invalid: also worth testing
|
||||||
return result;
|
return result;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user