diff options
| author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2019-07-03 15:02:20 +0200 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2019-07-18 11:00:44 +0000 |
| commit | 2519e4b73876102b46e72b795c96f1ea73c3d523 (patch) | |
| tree | 869f9aa99ff236096ea2555398795f92105e0040 /src/qml/jsruntime/qv4dateobject.cpp | |
| parent | 2b433c3e89cf6ba4fca9a2da28562a2c8ae93c1a (diff) | |
Fix tst_qqmllocale::timeZoneUpdated() test on Android
Switching to the POSIX implementation of DaylightSavingTA() fixes it
Fixes: QTBUG-77052
Task-number: QTBUG-73512
Change-Id: I24804f193ac6f85eb6764f656d351cdc272c7987
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4dateobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4dateobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp index 1b26608bf3..bba88e5c9a 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -54,7 +54,7 @@ #include <wtf/MathExtras.h> -#if defined(Q_OS_LINUX) && QT_CONFIG(timezone) +#if defined(Q_OS_LINUX) && QT_CONFIG(timezone) && !defined(Q_OS_ANDROID) /* See QTBUG-56899. Although we don't (yet) have a proper way to reset the system zone, the code below, that uses QTimeZone::systemTimeZone(), works |