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

Change-Id: I1609a9761c9942f3f702c6cb963d338674344ca5

2 files changed, 25 insertions, 3 deletions

diff --git a/dist/changes-5.1.0 b/dist/changes-5.1.0
new file mode 100644
index 0000000..505b0cc
--- /dev/null
+++ b/dist/changes-5.1.0
@@ -0,0 +1,22 @@
+Qt 5.1 introduces many new features and improvements as well as bugfixes
+over the 5.0.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.1
+
+The Qt version 5.1 series is binary compatible with the 5.0.x series.
+Applications compiled for 5.0 will continue to run with 5.1.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+ - 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 efdd777..71ab6e8 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp
@@ -36,9 +36,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <elf.h>
-#if !OS(ANDROID) && !PLATFORM(QT)
-# include <asm/hwcap.h>
-# else
+# if OS(ANDROID) && PLATFORM(QT)
 typedef struct
 {
     uint32_t a_type;
@@ -47,6 +45,8 @@ typedef struct
         uint32_t a_val;
     } a_un;
 } Elf32_auxv_t;
+# else
+# include <asm/hwcap.h>
 # endif
 #endif