Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: I81a3361580e025ea2a5984d2e7c552de96cbcf87

5 files changed, 49 insertions, 1 deletions

diff --git a/configure.json b/configure.json
new file mode 100644
index 0000000..63ea575
--- /dev/null
+++ b/configure.json
@@ -0,0 +1,5 @@
+{
+    "subconfigs": [
+        "src/script"
+    ]
+}
diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0
new file mode 100644
index 0000000..4f6c63e
--- /dev/null
+++ b/dist/changes-5.12.0
@@ -0,0 +1,18 @@
+Qt 5.12 introduces many new features and improvements as well as bugfixes
+over the 5.11.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp
index f42e69d..0e64ea1 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp
@@ -36,7 +36,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <elf.h>
-# if OS(ANDROID) && PLATFORM(QT)
+# if OS(ANDROID) && PLATFORM(QT) && !defined(HAVE_asm_hwcap_h)
 # include <asm/procinfo.h>
 # else
 # include <asm/hwcap.h>
diff --git a/src/script/configure.json b/src/script/configure.json
new file mode 100644
index 0000000..d8b45c9
--- /dev/null
+++ b/src/script/configure.json
@@ -0,0 +1,23 @@
+{
+    "module": "script",
+    "testDir": "../../config.tests",
+
+    "tests": {
+        "asm_hwcap_h": {
+            "label": "asm/hwcap.h",
+            "condition": "config.android",
+            "type": "compile",
+            "test": {
+                "include": "asm/hwcap.h"
+            }
+        }
+    },
+
+    "features": {
+        "asm_hwcap_h": {
+            "label": "asm/hwcap.h",
+            "condition": "config.android && tests.asm_hwcap_h",
+            "output": [ "privateFeature" ]
+        }
+    }
+}
diff --git a/src/script/script.pro b/src/script/script.pro
index cedc173..228f486 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -36,6 +36,8 @@ mac {
     }
 }
 
+qtConfig(asm_hwcap_h): DEFINES += HAVE_asm_hwcap_h
+
 # Suppress 'LEAK' messages (see QTBUG-18201)
 DEFINES += LOG_DISABLED=1