From 7748d3ca4671edf3b99fcbe7e35f23a747bba191 Mon Sep 17 00:00:00 2001
From: Janne Koskinen <janne.p.koskinen@qt.io>
Date: Tue, 6 Nov 2018 12:31:11 +0100
Subject: INTEGRITY: Fix build failure

Change-Id: Ibdf441d8c73b507a404391f82695d7a99eb3c6ca
Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/3rdparty/masm/yarr/YarrJIT.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/3rdparty')

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)
         {
-- 
cgit v1.2.3


From c765d5945b75a54d61297b8923497a034020337a Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 2 Nov 2018 11:33:34 +0100
Subject: Add a configure test for std::make_unique
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Seems like this is the only reliable way to determine whether we
have std::make_unique() or need to provide our own version.

Change-Id: I5b162e0a2d2448d7bc519958c6e85a075812135a
Fixes: QTBUG-71448
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/3rdparty/masm/stubs/wtf/Optional.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/3rdparty')

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>
-- 
cgit v1.2.3