diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-11 12:56:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-11 13:29:12 +0200 |
| commit | 2a98afad6eefab6039905f70df7d25537bc5774b (patch) | |
| tree | 974b6863e87a0da86bad55bf9af7e424b57806e5 /src/qml/jsruntime/qv4dateobject.cpp | |
| parent | fb04917e8eb1f7cc5832b2f13ab1d208b0e1014f (diff) | |
| parent | 2433fa45d75cf26add9e7f0ceb8ee439eba68753 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/qml/compiler/qv4compilerscanfunctions.cpp
tools/tools.pro
Done-with: Lars Knoll <lars.knoll@qt.io>
Change-Id: Ia77ee6ede6fc9760ce5a03d68079579a63e5a02f
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 8ad4ee8116..e9a2056a61 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -55,7 +55,7 @@ #include <wtf/MathExtras.h> -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) && QT_CONFIG(timezone) /* 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 |