diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-17 07:25:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-17 07:25:13 +0100 |
| commit | e7650520ef2d986051e00a86a5fe47d3859cbd44 (patch) | |
| tree | 4af3a37717cecec181c456fcf2c6097e2dc83182 /src/3rdparty | |
| parent | 1989323559a7bc08a469f9708c644dcad1f57600 (diff) | |
| parent | 896f772581849f970df5ecb2b73a829c9a0348b4 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
src/qml/jsruntime/qv4engine.cpp
src/qml/parser/qqmljs.g
Change-Id: I5f89199ef7a846032a3118cba1298de992c22f8f
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/stubs/wtf/Optional.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/stubs/wtf/Optional.h b/src/3rdparty/masm/stubs/wtf/Optional.h index 602dbc1b43..e0fd4421a9 100644 --- a/src/3rdparty/masm/stubs/wtf/Optional.h +++ b/src/3rdparty/masm/stubs/wtf/Optional.h @@ -43,7 +43,7 @@ #include <QtQml/private/qtqmlglobal_p.h> #include <memory> -#if __cplusplus > 201402L && QT_HAS_INCLUDE(<optional>) +#if __cplusplus > 201402L && __has_include(<optional>) #include <optional> #else |