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

Conflicts:
	src/corelib/global/qglobal.h
	src/platformsupport/platformcompositor/qopenglcompositor.cpp
	src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I5422868500be695584a496dbbbc719d146bc572d

2 files changed, 73 insertions, 0 deletions

diff --git a/src/angle/patches/0020-ANGLE-Do-not-use-std-strlen.patch b/src/angle/patches/0020-ANGLE-Do-not-use-std-strlen.patch
new file mode 100644
index 0000000000..324244f6eb
--- /dev/null
+++ b/src/angle/patches/0020-ANGLE-Do-not-use-std-strlen.patch
@@ -0,0 +1,30 @@
+From 071b8936386b0b44475c91511d85479e5c633bc5 Mon Sep 17 00:00:00 2001
+From: Kai Koehne <kai.koehne@theqtcompany.com>
+Date: Thu, 11 Dec 2014 13:54:23 +0100
+Subject: [PATCH] ANGLE: Do not use std::strlen
+
+This is a cherry-pick from upstream change
+
+e7cfb3dd2029c1bfe5c175ad994c03cac221ad4d
+
+Change-Id: Iefe01545319f9ad268c0c6bf8e8b2181e09d8a84
+---
+ src/3rdparty/angle/src/libGLESv2/Shader.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/angle/src/libGLESv2/Shader.cpp b/src/3rdparty/angle/src/libGLESv2/Shader.cpp
+index 5bca746..024ef8f 100644
+--- a/src/3rdparty/angle/src/libGLESv2/Shader.cpp
++++ b/src/3rdparty/angle/src/libGLESv2/Shader.cpp
+@@ -53,7 +53,7 @@ void Shader::setSource(GLsizei count, const char *const *string, const GLint *le
+     {
+         if (length == nullptr || length[i] < 0)
+         {
+-            stream.write(string[i], std::strlen(string[i]));
++            stream.write(string[i], strlen(string[i]));
+         }
+         else
+         {
+-- 
+1.9.4.msysgit.0
+
diff --git a/src/angle/patches/0020-ANGLE-Fix-compilation-with-MSVC2013-Update4.patch b/src/angle/patches/0020-ANGLE-Fix-compilation-with-MSVC2013-Update4.patch
new file mode 100644
index 0000000000..49b229d905
--- /dev/null
+++ b/src/angle/patches/0020-ANGLE-Fix-compilation-with-MSVC2013-Update4.patch
@@ -0,0 +1,43 @@
+From a48dfb3f1ecb57a59084c0e87155506586b73188 Mon Sep 17 00:00:00 2001
+From: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
+Date: Thu, 11 Dec 2014 13:11:55 +0100
+Subject: [PATCH] [ANGLE] Fix compilation with MSVC2013 Update4
+
+Update4 provides a native Sleep implementation. Hence the wrapper
+needs to be disabled.
+
+Change-Id: I162da45934b02c262ac09b557c66c3363c276e54
+---
+ src/3rdparty/angle/src/common/utilities.cpp | 2 +-
+ src/3rdparty/angle/src/common/utilities.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/3rdparty/angle/src/common/utilities.cpp b/src/3rdparty/angle/src/common/utilities.cpp
+index 9d797a6..924573e 100644
+--- a/src/3rdparty/angle/src/common/utilities.cpp
++++ b/src/3rdparty/angle/src/common/utilities.cpp
+@@ -486,7 +486,7 @@ void writeFile(const char* path, const void* content, size_t size)
+ }
+ #endif // !ANGLE_ENABLE_WINDOWS_STORE
+ 
+-#if defined(ANGLE_ENABLE_WINDOWS_STORE)
++#if defined(ANGLE_ENABLE_WINDOWS_STORE) && _MSC_FULL_VER < 180031101
+ 
+ void Sleep(unsigned long dwMilliseconds)
+ {
+diff --git a/src/3rdparty/angle/src/common/utilities.h b/src/3rdparty/angle/src/common/utilities.h
+index 2cf6bed..7583d3e 100644
+--- a/src/3rdparty/angle/src/common/utilities.h
++++ b/src/3rdparty/angle/src/common/utilities.h
+@@ -51,7 +51,7 @@ std::string getTempPath();
+ void writeFile(const char* path, const void* data, size_t size);
+ #endif
+ 
+-#if defined(ANGLE_ENABLE_WINDOWS_STORE)
++#if defined(ANGLE_ENABLE_WINDOWS_STORE) && _MSC_FULL_VER < 180031101
+ void Sleep(_In_ unsigned long dwMilliseconds);
+ #endif
+ 
+-- 
+1.9.4.msysgit.2
+