diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-20 17:39:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-21 21:22:46 +0200 |
| commit | 43431619d644ebd783d292a12c1904cfd7680824 (patch) | |
| tree | 7d79c2b79f6ed450613b29de700ee488d8cd99f4 /src/3rdparty | |
| parent | 7a1b5b1cfece18d5f4b2d8beb340d3cbe8f54451 (diff) | |
| parent | cb6c208c77e2e3c8b6d5957fae73f0326eee4296 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/quick/items/qquickflickable_p_p.h
src/quick/items/qquickpathview_p_p.h
tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
Change-Id: I77664a095d8a203e07a021c9d5953e02b8b99a1e
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 28a189b6e6..9c38af6b16 100644 --- a/src/3rdparty/masm/wtf/MathExtras.h +++ b/src/3rdparty/masm/wtf/MathExtras.h @@ -43,7 +43,7 @@ #include <machine/ieee.h> #endif -#if OS(QNX) +#if OS(QNX) && defined(_CPPLIB_VER) // FIXME: Look into a way to have cmath import its functions into both the standard and global // namespace. For now, we include math.h since the QNX cmath header only imports its functions // into the standard namespace. |