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

Disable timezone which is not supported on Vxworks

Browse Source 
Task-number: QTBUG-115777
Change-Id: I69bf26d2e752d76d06edf569766d4298fb4fd1a8
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Marcin Zdunek 2023-11-28 14:39:45 +01:00
parent 4366487e79
commit 8e97af265d
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/configure.cmake
View File

@ -803,7 +803,7 @@ qt_feature("timezone" PUBLIC
SECTION "Utilities" SECTION "Utilities"
LABEL "QTimeZone" LABEL "QTimeZone"
PURPOSE "Provides support for time-zone handling." PURPOSE "Provides support for time-zone handling."
CONDITION NOT WASM CONDITION NOT WASM AND NOT VXWORKS
) )
qt_feature("datetimeparser" PRIVATE qt_feature("datetimeparser" PRIVATE
SECTION "Utilities" SECTION "Utilities"

35
tests/benchmarks/corelib/time/qdatetime/tst_bench_qdatetime.cpp
View File

@ -13,7 +13,9 @@ class tst_QDateTime : public QObject
Q_OBJECT Q_OBJECT
static QList<QDateTime> daily(qint64 start, qint64 end); static QList<QDateTime> daily(qint64 start, qint64 end);
#if QT_CONFIG(timezone)
static QList<QDateTime> norse(qint64 start, qint64 end); static QList<QDateTime> norse(qint64 start, qint64 end);
#endif
void decade_data(); void decade_data();
private Q_SLOTS: private Q_SLOTS:
@ -28,8 +30,10 @@ private Q_SLOTS:
void timeZoneAbbreviation(); void timeZoneAbbreviation();
void toMSecsSinceEpoch_data() { decade_data(); } void toMSecsSinceEpoch_data() { decade_data(); }
void toMSecsSinceEpoch(); void toMSecsSinceEpoch();
#if QT_CONFIG(timezone)
void toMSecsSinceEpochTz_data() { decade_data(); } void toMSecsSinceEpochTz_data() { decade_data(); }
void toMSecsSinceEpochTz(); void toMSecsSinceEpochTz();
#endif
void setDate(); void setDate();
void setTime(); void setTime();
#if QT_DEPRECATED_SINCE(6, 9) #if QT_DEPRECATED_SINCE(6, 9)
@ -37,14 +41,18 @@ private Q_SLOTS:
void setOffsetFromUtc(); void setOffsetFromUtc();
#endif #endif
void setMSecsSinceEpoch(); void setMSecsSinceEpoch();
#if QT_CONFIG(timezone)
void setMSecsSinceEpochTz(); void setMSecsSinceEpochTz();
#endif
void toString(); void toString();
void toStringTextFormat(); void toStringTextFormat();
void toStringIsoFormat(); void toStringIsoFormat();
void addDays(); void addDays();
#if QT_CONFIG(timezone)
void addDaysTz(); void addDaysTz();
void addMSecs();
void addMSecsTz(); void addMSecsTz();
#endif
void addMSecs();
#if QT_DEPRECATED_SINCE(6, 9) #if QT_DEPRECATED_SINCE(6, 9)
void toTimeSpec(); void toTimeSpec();
void toOffsetFromUtc(); void toOffsetFromUtc();
@ -65,7 +73,9 @@ private Q_SLOTS:
void fromStringIso(); void fromStringIso();
void fromMSecsSinceEpoch(); void fromMSecsSinceEpoch();
void fromMSecsSinceEpochUtc(); void fromMSecsSinceEpochUtc();
#if QT_CONFIG(timezone)
void fromMSecsSinceEpochTz(); void fromMSecsSinceEpochTz();
#endif
}; };
using namespace QtPrivate::DateTimeConstants; using namespace QtPrivate::DateTimeConstants;
@ -102,7 +112,7 @@ QList<QDateTime> tst_QDateTime::daily(qint64 start, qint64 end)
list.append(QDateTime(QDate::fromJulianDay(jd).startOfDay())); list.append(QDateTime(QDate::fromJulianDay(jd).startOfDay()));
return list; return list;
} }
#if QT_CONFIG(timezone)
QList<QDateTime> tst_QDateTime::norse(qint64 start, qint64 end) QList<QDateTime> tst_QDateTime::norse(qint64 start, qint64 end)
{ {
const QTimeZone cet("Europe/Oslo"); const QTimeZone cet("Europe/Oslo");
@ -112,7 +122,7 @@ QList<QDateTime> tst_QDateTime::norse(qint64 start, qint64 end)
list.append(QDateTime(QDate::fromJulianDay(jd).startOfDay(cet))); list.append(QDateTime(QDate::fromJulianDay(jd).startOfDay(cet)));
return list; return list;
} }
#endif
void tst_QDateTime::create() void tst_QDateTime::create()
{ {
QFETCH(const qint64, startJd); QFETCH(const qint64, startJd);
@ -199,7 +209,7 @@ void tst_QDateTime::toMSecsSinceEpoch()
test.toMSecsSinceEpoch(); test.toMSecsSinceEpoch();
} }
} }
#if QT_CONFIG(timezone)
void tst_QDateTime::toMSecsSinceEpochTz() void tst_QDateTime::toMSecsSinceEpochTz()
{ {
QFETCH(const qint64, startJd); QFETCH(const qint64, startJd);
@ -213,7 +223,7 @@ void tst_QDateTime::toMSecsSinceEpochTz()
} }
Q_UNUSED(result); Q_UNUSED(result);
} }
#endif
void tst_QDateTime::setDate() void tst_QDateTime::setDate()
{ {
const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2020); const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2020);
@ -264,7 +274,7 @@ void tst_QDateTime::setMSecsSinceEpoch()
test.setMSecsSinceEpoch(msecs); test.setMSecsSinceEpoch(msecs);
} }
} }
#if QT_CONFIG(timezone)
void tst_QDateTime::setMSecsSinceEpochTz() void tst_QDateTime::setMSecsSinceEpochTz()
{ {
const qint64 msecs = qint64(JULIAN_DAY_2010 - JULIAN_DAY_1970 + 180) * MSECS_PER_DAY; const qint64 msecs = qint64(JULIAN_DAY_2010 - JULIAN_DAY_1970 + 180) * MSECS_PER_DAY;
@ -274,7 +284,7 @@ void tst_QDateTime::setMSecsSinceEpochTz()
test.setMSecsSinceEpoch(msecs); test.setMSecsSinceEpoch(msecs);
} }
} }
#endif
void tst_QDateTime::toString() void tst_QDateTime::toString()
{ {
const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2011); const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2011);
@ -312,7 +322,7 @@ void tst_QDateTime::addDays()
} }
Q_UNUSED(next); Q_UNUSED(next);
} }
#if QT_CONFIG(timezone)
void tst_QDateTime::addDaysTz() void tst_QDateTime::addDaysTz()
{ {
const auto list = norse(JULIAN_DAY_2010, JULIAN_DAY_2020); const auto list = norse(JULIAN_DAY_2010, JULIAN_DAY_2020);
@ -321,7 +331,7 @@ void tst_QDateTime::addDaysTz()
QDateTime result = test.addDays(1); QDateTime result = test.addDays(1);
} }
} }
#endif
void tst_QDateTime::addMSecs() void tst_QDateTime::addMSecs()
{ {
const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2020); const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2020);
@ -332,7 +342,7 @@ void tst_QDateTime::addMSecs()
} }
Q_UNUSED(next); Q_UNUSED(next);
} }
#if QT_CONFIG(timezone)
void tst_QDateTime::addMSecsTz() void tst_QDateTime::addMSecsTz()
{ {
const auto list = norse(JULIAN_DAY_2010, JULIAN_DAY_2020); const auto list = norse(JULIAN_DAY_2010, JULIAN_DAY_2020);
@ -341,7 +351,7 @@ void tst_QDateTime::addMSecsTz()
QDateTime result = test.addMSecs(1); QDateTime result = test.addMSecs(1);
} }
} }
#endif
#if QT_DEPRECATED_SINCE(6, 9) #if QT_DEPRECATED_SINCE(6, 9)
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED QT_WARNING_DISABLE_DEPRECATED
@ -527,7 +537,7 @@ void tst_QDateTime::fromMSecsSinceEpochUtc()
QDateTime::fromMSecsSinceEpoch(jd * MSECS_PER_DAY, QTimeZone::UTC); QDateTime::fromMSecsSinceEpoch(jd * MSECS_PER_DAY, QTimeZone::UTC);
} }
} }
#if QT_CONFIG(timezone)
void tst_QDateTime::fromMSecsSinceEpochTz() void tst_QDateTime::fromMSecsSinceEpochTz()
{ {
const int start = JULIAN_DAY_2010 - JULIAN_DAY_1970; const int start = JULIAN_DAY_2010 - JULIAN_DAY_1970;
@ -538,6 +548,7 @@ void tst_QDateTime::fromMSecsSinceEpochTz()
QDateTime test = QDateTime::fromMSecsSinceEpoch(jd * MSECS_PER_DAY, cet); QDateTime test = QDateTime::fromMSecsSinceEpoch(jd * MSECS_PER_DAY, cet);
} }
} }
#endif
QTEST_MAIN(tst_QDateTime) QTEST_MAIN(tst_QDateTime)

6
tests/benchmarks/corelib/time/qtimezone/tst_bench_qtimezone.cpp
View File

@ -15,6 +15,7 @@ class tst_QTimeZone : public QObject
Q_OBJECT Q_OBJECT
private Q_SLOTS: private Q_SLOTS:
#if QT_CONFIG(timezone)
void isTimeZoneIdAvailable(); void isTimeZoneIdAvailable();
void systemTimeZone(); void systemTimeZone();
void zoneByName_data(); void zoneByName_data();
@ -25,6 +26,7 @@ private Q_SLOTS:
void transitionsForward(); void transitionsForward();
void transitionsReverse_data() { transitionList_data(); } void transitionsReverse_data() { transitionList_data(); }
void transitionsReverse(); void transitionsReverse();
#endif
}; };
static QList<QByteArray> enoughZones() static QList<QByteArray> enoughZones()
@ -52,7 +54,7 @@ static QList<QByteArray> enoughZones()
result << QByteArray("Vulcan/ShiKahr"); // invalid: also worth testing result << QByteArray("Vulcan/ShiKahr"); // invalid: also worth testing
return result; return result;
} }
#if QT_CONFIG(timezone)
void tst_QTimeZone::isTimeZoneIdAvailable() void tst_QTimeZone::isTimeZoneIdAvailable()
{ {
const QList<QByteArray> available = QTimeZone::availableTimeZoneIds(); const QList<QByteArray> available = QTimeZone::availableTimeZoneIds();
@ -68,7 +70,6 @@ void tst_QTimeZone::systemTimeZone()
QTimeZone::systemTimeZone(); QTimeZone::systemTimeZone();
} }
} }
void tst_QTimeZone::zoneByName_data() void tst_QTimeZone::zoneByName_data()
{ {
QTest::addColumn<QByteArray>("name"); QTest::addColumn<QByteArray>("name");
@ -139,6 +140,7 @@ void tst_QTimeZone::transitionsReverse()
tran = zone.previousTransition(tran.atUtc); tran = zone.previousTransition(tran.atUtc);
} }
} }
#endif
QTEST_MAIN(tst_QTimeZone) QTEST_MAIN(tst_QTimeZone)