diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-13 09:04:09 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-13 19:06:06 +0200 |
| commit | 4d2f743baaf6869693f4540df668e1b998154785 (patch) | |
| tree | ba712b420e5d299be28faf641d30585ae8dce4e7 /src/3rdparty | |
| parent | 0c5a9ff9876cb1af53317720d1de8baae003e21d (diff) | |
| parent | 0932a59971f606f07b41da19f3974d51b7008180 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
Change-Id: I26d6435a29cac3840bb567ade5149c2562a94bf9
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 9ded0ab736..28a189b6e6 100644 --- a/src/3rdparty/masm/wtf/MathExtras.h +++ b/src/3rdparty/masm/wtf/MathExtras.h @@ -106,7 +106,7 @@ inline bool isinf(double x) { return !finite(x) && !isnand(x); } #endif -#if OS(OPENBSD) +#if OS(OPENBSD) && __cplusplus < 201103L namespace std { |