diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-10 10:06:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-10 10:06:39 +0200 |
| commit | 0932a59971f606f07b41da19f3974d51b7008180 (patch) | |
| tree | 191aab5e88e7b4ddf3724dcbf3b8229512e433f2 /src/3rdparty | |
| parent | aca40a8361996e22ec4f020b803404031a0f0d76 (diff) | |
| parent | cd0efef04bd45eca6cc72b5a000e4e5586153290 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Part of 0e053528 was reverted in the merge, about lastTimestamp. It
will be applied later in separate commit.
qmltest::shadersource-dynamic-sourceobject::test_endresult() was
blacklisted on linux.
Conflicts:
.qmake.conf
tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
tests/auto/qmltest/BLACKLIST
tests/auto/qmltest/qmltest.pro
Task-number: QTBUG-53590
Task-number: QTBUG-53971
Change-Id: I48af90b49a3c7b29de16f4178a04807f8bc05130
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 { |