diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2019-12-09 00:09:02 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2019-12-16 00:57:22 +0100 |
| commit | 67417e8bc9e5fc66e6c3fc83e6b9a13694a01e9d (patch) | |
| tree | d9b48227bf866ca6d798abc5b90c59704410f572 /src | |
| parent | 67cb80db8ea1581d632db30ff26b03b1287cb393 (diff) | |
Remove use of wrapper macros for feature detection
Change-Id: Ic9cd7e4ff2c5d253879b0aeaa15dbc25cad82891
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/masm/stubs/wtf/Optional.h | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 3d3f452073..db3ca97780 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -219,7 +219,7 @@ ExecutionEngine::ExecutionEngine(QJSEngine *jsEngine) ok = false; maxCallDepth = qEnvironmentVariableIntValue("QV4_MAX_CALL_DEPTH", &ok); if (!ok || maxCallDepth <= 0) { -#if defined(QT_NO_DEBUG) && !defined(__SANITIZE_ADDRESS__) && !QT_HAS_FEATURE(address_sanitizer) +#if defined(QT_NO_DEBUG) && !defined(__SANITIZE_ADDRESS__) && !__has_feature(address_sanitizer) maxCallDepth = 1234; #else // no (tail call) optimization is done, so there'll be a lot mare stack frames active |