From e6bf2376697975313b7ccd3f9bcebb869bb0b04c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Mon, 27 Mar 2017 10:54:59 +0200
Subject: Make build ABI available as qmake variable

This is needed to encode the correct ABI into the generated qml caches.
It is identical with the return value of QSysInfo::buildAbi().

Change-Id: I2d581b22326da4220f412ab4f517156f4ba31897
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 config.tests/arch/arch.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'config.tests')

diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp
index f99c5ca118..bb3efec177 100644
--- a/config.tests/arch/arch.cpp
+++ b/config.tests/arch/arch.cpp
@@ -284,8 +284,12 @@ const char msg2[] = "==Qt=magic=Qt== Sub-architecture:"
 #endif
                    "";
 
+extern const char msg3[];
+const char msg3[] = "==Qt=magic=Qt== Build-ABI:" ARCH_FULL;
+
 int main()
 {
     puts(msg);
     puts(msg2);
+    puts(msg3);
 }
-- 
cgit v1.2.3


From e8cf0bf5f8fe0dd2b4bbfa0c85a32e7edb69e2f4 Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Wed, 1 Mar 2017 13:25:13 +0000
Subject: PCRE2: fix the configure test

A typo caused the test to never detect the system wide PCRE.

Task-number: QTBUG-59226
Change-Id: I42ada99aac240455d11b53d2ab59d712d8f811ff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 config.tests/unix/pcre2/pcre2.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'config.tests')

diff --git a/config.tests/unix/pcre2/pcre2.cpp b/config.tests/unix/pcre2/pcre2.cpp
index 48130f97c4..9c94d29999 100644
--- a/config.tests/unix/pcre2/pcre2.cpp
+++ b/config.tests/unix/pcre2/pcre2.cpp
@@ -37,9 +37,11 @@
 **
 ****************************************************************************/
 
+#define PCRE2_CODE_UNIT_WIDTH 16
+
 #include <pcre2.h>
 
-#if (PCRE2_MAJOR < 10) || ((PCRE2_MAJOR == 10) && (PCRE_MINOR < 20))
+#if (PCRE2_MAJOR < 10) || ((PCRE2_MAJOR == 10) && (PCRE2_MINOR < 20))
 #error This PCRE version is not supported
 #endif
 
-- 
cgit v1.2.3