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

For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812

5 files changed, 73 insertions, 10 deletions

diff --git a/src/angle/patches/0001-ANGLE-Fix-compilation-with-MSVC2013.patch b/src/angle/patches/0001-ANGLE-Fix-compilation-with-MSVC2013.patch
new file mode 100644
index 0000000000..cf32a20d46
--- /dev/null
+++ b/src/angle/patches/0001-ANGLE-Fix-compilation-with-MSVC2013.patch
@@ -0,0 +1,28 @@
+From 4863cf64cd332a5fcefe453634c3c5ef62cb758c Mon Sep 17 00:00:00 2001
+From: Friedemann Kleint <Friedemann.Kleint@digia.com>
+Date: Thu, 24 Oct 2013 12:49:59 +0300
+Subject: [PATCH] ANGLE: Fix compilation with MSVC2013.
+
+Add missing include for std::min(), std::max().
+
+Change-Id: I740e5db94f9f958ac65de8dd7baab7e203482637
+---
+ src/3rdparty/angle/src/libEGL/Surface.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/3rdparty/angle/src/libEGL/Surface.cpp b/src/3rdparty/angle/src/libEGL/Surface.cpp
+index b47a7bc..83fbbf5 100644
+--- a/src/3rdparty/angle/src/libEGL/Surface.cpp
++++ b/src/3rdparty/angle/src/libEGL/Surface.cpp
+@@ -20,6 +20,8 @@
+ #include "libEGL/main.h"
+ #include "libEGL/Display.h"
+ 
++#include <algorithm>
++
+ namespace egl
+ {
+ 
+-- 
+1.8.3.msysgit.0
+
diff --git a/src/angle/patches/0001-Fix-compilation-with-MinGW-gcc-64-bit.patch b/src/angle/patches/0001-Fix-compilation-with-MinGW-gcc-64-bit.patch
new file mode 100644
index 0000000000..0420694c91
--- /dev/null
+++ b/src/angle/patches/0001-Fix-compilation-with-MinGW-gcc-64-bit.patch
@@ -0,0 +1,35 @@
+From 821c28d387b332bf16b6ea35ec22a77d3ba41632 Mon Sep 17 00:00:00 2001
+From: Kai Koehne <kai.koehne@digia.com>
+Date: Mon, 28 Oct 2013 10:27:53 +0100
+Subject: [PATCH] Fix compilation with MinGW gcc 64 bit
+
+Fix compilation of ANGLE with gcc 4.8.0 64 bit: The
+
+  reinterpret_cast<unsigned long>(void*)
+
+was causing
+
+  error: cast from 'const void*' to 'long unsigned int' loses precision
+
+Task-number: QTBUG-34395
+Change-Id: Ibde75dd4b5536f3827bdf0ab02a15e93a1a8a4f0
+---
+ src/3rdparty/angle/src/third_party/trace_event/trace_event.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/angle/src/third_party/trace_event/trace_event.h b/src/3rdparty/angle/src/third_party/trace_event/trace_event.h
+index 113b126..72d354d 100644
+--- a/src/3rdparty/angle/src/third_party/trace_event/trace_event.h
++++ b/src/3rdparty/angle/src/third_party/trace_event/trace_event.h
+@@ -589,7 +589,7 @@ const unsigned long long noEventId = 0;
+ class TraceID {
+ public:
+     explicit TraceID(const void* id, unsigned char* flags) :
+-        m_data(static_cast<unsigned long long>(reinterpret_cast<unsigned long>(id)))
++        m_data(reinterpret_cast<unsigned long long>(id))
+     {
+         *flags |= TRACE_EVENT_FLAG_MANGLE_ID;
+     }
+-- 
+1.8.3.msysgit.0
+
diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri
index 12e26a9a68..58ad88673a 100644
--- a/src/angle/src/common/common.pri
+++ b/src/angle/src/common/common.pri
@@ -4,10 +4,10 @@ INCLUDEPATH += \
     $$ANGLE_DIR/src \
     $$ANGLE_DIR/include
 
-LIBS = $$QMAKE_LIBS_CORE $$QMAKE_LIBS_GUI
+LIBS_PRIVATE = $$QMAKE_LIBS_CORE $$QMAKE_LIBS_GUI
 
 # DirectX is included in the Windows 8 Kit, but everything else requires the DX SDK.
-win32-msvc2012|winrt {
+win32-msvc2012|win32-msvc2013|winrt {
     FXC = fxc.exe
 } else {
     DX_DIR = $$(DXSDK_DIR)
@@ -36,7 +36,7 @@ win32-msvc2012|winrt {
 
         # Similarly we want the MinGW linker to use the import libraries shipped with the compiler
         # instead of those from the SDK which cause a crash on startup.
-        LIBS += -L\"$$DXLIB_DIR\"
+        LIBS_PRIVATE += -L\"$$DXLIB_DIR\"
     }
 }
 
diff --git a/src/angle/src/libEGL/libEGL.pro b/src/angle/src/libEGL/libEGL.pro
index 3781bd7868..b5854189f9 100644
--- a/src/angle/src/libEGL/libEGL.pro
+++ b/src/angle/src/libEGL/libEGL.pro
@@ -4,11 +4,11 @@ TARGET = $$qtLibraryTarget(libEGL)
 include(../common/common.pri)
 
 angle_d3d11 {
-    LIBS += -ld3d11
+    LIBS_PRIVATE += -ld3d11
 } else {
-    LIBS += -ld3d9
+    LIBS_PRIVATE += -ld3d9
 }
-LIBS += -ldxguid -L$$QT_BUILD_TREE/lib -l$$qtLibraryTarget(libGLESv2)
+LIBS_PRIVATE += -ldxguid -L$$QT_BUILD_TREE/lib -l$$qtLibraryTarget(libGLESv2)
 
 HEADERS += \
     $$ANGLE_DIR/src/libEGL/Config.h \
diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro
index b39ce781e1..5b3a49ed56 100644
--- a/src/angle/src/libGLESv2/libGLESv2.pro
+++ b/src/angle/src/libGLESv2/libGLESv2.pro
@@ -8,18 +8,18 @@ INCLUDEPATH += $$OUT_PWD/.. $$ANGLE_DIR/src/libGLESv2
 
 # Remember to adapt tools/configure/configureapp.cpp if the Direct X version changes.
 angle_d3d11 {
-    LIBS += -ldxgi -ld3d11
+    LIBS_PRIVATE += -ldxgi -ld3d11
 } else {
-    LIBS += -ld3d9
+    LIBS_PRIVATE += -ld3d9
 }
-LIBS += -ldxguid
+LIBS_PRIVATE += -ldxguid
 STATICLIBS = translator_common translator_hlsl preprocessor
 
 for(libname, STATICLIBS) {
     # Appends 'd' to the library for debug builds and builds up the fully
     # qualified path to pass to the linker.
     staticlib = $$QT_BUILD_TREE/lib/$${QMAKE_PREFIX_STATICLIB}$$qtLibraryTarget($$libname).$${QMAKE_EXTENSION_STATICLIB}
-    LIBS += $$staticlib
+    LIBS_PRIVATE += $$staticlib
     PRE_TARGETDEPS += $$staticlib
 }