diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-26 00:34:21 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 00:34:21 +0100 |
commit | 0076c44d3993f377ad6417d3bb08109b608dfbd2 (patch) | |
tree | 498a1f3d0997da8e3959e6a1d47071d56a6ce900 /src/3rdparty | |
parent | 5f0eab2df3c82a71f70ea5a6535541fa786c6a78 (diff) | |
parent | 9aed949bb99b9bf328322457a02ad1a9fb330f2d (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/quick/util/qquickutilmodule.cpp
tools/qmllint/main.cpp
Change-Id: Ic2283f88c293ca7fc776de3e83eb4c7812309d8a
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/masm/wtf/MathExtras.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/wtf/MathExtras.h b/src/3rdparty/masm/wtf/MathExtras.h index 75e3670367..3740d54beb 100644 --- a/src/3rdparty/masm/wtf/MathExtras.h +++ b/src/3rdparty/masm/wtf/MathExtras.h @@ -88,7 +88,7 @@ inline double wtf_ceil(double x) { return copysign(ceil(x), x); } #endif -#if OS(SOLARIS) +#if OS(SOLARIS) && __cplusplus < 201103L namespace std { |