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

Conflicts:
	.qmake.conf

Change-Id: I0d75cdb889e1ea18837037e08be531a99a8ce5eb

4 files changed, 30 insertions, 4 deletions

diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0
new file mode 100644
index 0000000..064222d
--- /dev/null
+++ b/dist/changes-5.9.0
@@ -0,0 +1,27 @@
+Qt 5.9 introduces many new features and improvements as well as bugfixes
+over the 5.8.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+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.
+
+Third-Party Code
+----------------
+
+ - Update the bundled libwebp to version 0.6.0.
+
+TIFF handler
+--------------
+
+ - Add support for reading color indexed and grayscale images stored
+   in tiled format.
diff --git a/src/3rdparty/libwebp.pri b/src/3rdparty/libwebp.pri
index 61fbee9..55d7e60 100644
--- a/src/3rdparty/libwebp.pri
+++ b/src/3rdparty/libwebp.pri
@@ -113,7 +113,7 @@ SOURCES += \
     $$PWD/libwebp/src/utils/thread_utils.c \
     $$PWD/libwebp/src/utils/utils.c
 
-android {
+android:!android-embedded {
     SOURCES += $$NDK_ROOT/sources/android/cpufeatures/cpu-features.c
     INCLUDEPATH += $$NDK_ROOT/sources/android/cpufeatures
 }
diff --git a/src/3rdparty/libwebp/src/dsp/cpu.c b/src/3rdparty/libwebp/src/dsp/cpu.c
index b5583b6..b39184e 100644
--- a/src/3rdparty/libwebp/src/dsp/cpu.c
+++ b/src/3rdparty/libwebp/src/dsp/cpu.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #endif
 
-#if defined(WEBP_ANDROID_NEON)
+#if defined(WEBP_ANDROID_NEON) && !defined(Q_OS_ANDROID_EMBEDDED)
 #include <cpu-features.h>
 #endif
 
@@ -168,7 +168,7 @@ static int x86CPUInfo(CPUFeature feature) {
   return 0;
 }
 VP8CPUInfo VP8GetCPUInfo = x86CPUInfo;
-#elif defined(WEBP_ANDROID_NEON)  // NB: needs to be before generic NEON test.
+#elif defined(WEBP_ANDROID_NEON) && !defined(Q_OS_ANDROID_EMBEDDED) // NB: needs to be before generic NEON test.
 static int AndroidCPUInfo(CPUFeature feature) {
   const AndroidCpuFamily cpu_family = android_getCpuFamily();
   const uint64_t cpu_features = android_getCpuFeatures();
diff --git a/src/imageformats/doc/src/qtimageformats.qdoc b/src/imageformats/doc/src/qtimageformats.qdoc
index 90369ed..8852117 100644
--- a/src/imageformats/doc/src/qtimageformats.qdoc
+++ b/src/imageformats/doc/src/qtimageformats.qdoc
@@ -52,7 +52,6 @@ libraries. If not found, it may fall back on using a bundled copy (in
 
 \table
 \header \li Format \li Description                      \li Support      \li 3rd Party Codec
-\row    \li DDS    \li Direct Draw Surface              \li Read/write   \li No
 \row    \li ICNS   \li Apple Icon Image                 \li Read/write   \li No
 \row    \li JP2    \li Joint Photographic Experts Group 2000 \li Read/write   \li Yes (bundled, unmaintained)
 \row    \li MNG    \li Multiple-image Network Graphics  \li Read         \li Yes (bundled, unmaintained)