diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 10:08:49 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 10:08:50 +0100 |
| commit | e7c316504770ce357b2c73be485cdd8c1da9c4c1 (patch) | |
| tree | b49032420022617396a83da310ebe01b38cda8f9 /src/3rdparty | |
| parent | 87265c7ab8743ece92262cd6b79bbba9dddd1fe1 (diff) | |
| parent | e3948955c961972d34483e7da9c2908f5cb84420 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I7623438dde316ae1e97802f91991f2e7ccc205a5
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/stubs/wtf/Optional.h | 3 | ||||
| -rw-r--r-- | src/3rdparty/masm/yarr/YarrJIT.cpp | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/3rdparty/masm/stubs/wtf/Optional.h b/src/3rdparty/masm/stubs/wtf/Optional.h index 235730a87d..fdb7de51ce 100644 --- a/src/3rdparty/masm/stubs/wtf/Optional.h +++ b/src/3rdparty/masm/stubs/wtf/Optional.h @@ -40,6 +40,7 @@ #pragma once #include <QtCore/qglobal.h> +#include <QtQml/private/qtqmlglobal_p.h> #include <memory> #if __cplusplus > 201402L && QT_HAS_INCLUDE(<optional>) @@ -83,7 +84,7 @@ private: #endif -#if __cplusplus < 201402L && !defined(__cpp_lib_make_unique) && !defined(Q_CC_MSVC) && !defined(Q_CC_GHS) +#if __cplusplus < 201402L && !QT_CONFIG(cxx14_make_unique) namespace std { template<typename T, class ...Args> diff --git a/src/3rdparty/masm/yarr/YarrJIT.cpp b/src/3rdparty/masm/yarr/YarrJIT.cpp index ce7c7163ed..9a9ab581e8 100644 --- a/src/3rdparty/masm/yarr/YarrJIT.cpp +++ b/src/3rdparty/masm/yarr/YarrJIT.cpp @@ -177,11 +177,21 @@ class YarrGenerator : private DefaultMacroAssembler { uint32_t begin; uint32_t matchAmount; uintptr_t returnAddress; +#if OS(INTEGRITY) + union { + struct Subpatterns { + unsigned start; + unsigned end; + } subpatterns[1]; + uintptr_t frameSlots[1]; + }; +#else struct Subpatterns { unsigned start; unsigned end; } subpatterns[0]; uintptr_t frameSlots[0]; +#endif static size_t sizeFor(ParenContextSizes& parenContextSizes) { |