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

1 files changed, 0 insertions, 125 deletions

diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h
index c2854b26c3..22dd56e772 100644
--- a/src/corelib/global/qconfig-nacl.h
+++ b/src/corelib/global/qconfig-nacl.h
@@ -72,9 +72,6 @@
 #ifndef QT_NO_FILESYSTEMWATCHER
 #  define QT_NO_FILESYSTEMWATCHER
 #endif
-#ifndef QT_NO_FSFILEENGINE
-#  define QT_NO_FSFILEENGINE
-#endif
 #ifndef QT_NO_FILESYSTEMMODEL
 #  define QT_NO_FILESYSTEMMODEL
 #endif
@@ -94,11 +91,6 @@
 #  define QT_NO_LIBRARY
 #endif
 
-/* Fonts */
-#ifndef QT_NO_QWS_QPF2
-#  define QT_NO_QWS_QPF2
-#endif
-
 /* Images */
 #ifndef QT_NO_IMAGEFORMATPLUGIN
 #  define QT_NO_IMAGEFORMATPLUGIN
@@ -114,9 +106,6 @@
 #ifndef QT_NO_BIG_CODECS
 #  define QT_NO_BIG_CODECS
 #endif
-#ifndef QT_NO_QWS_INPUTMETHODS
-#  define QT_NO_QWS_INPUTMETHODS
-#endif
 #ifndef QT_NO_TEXTCODEC
 #  define QT_NO_TEXTCODEC
 #endif
@@ -126,9 +115,6 @@
 #ifndef QT_NO_TRANSLATION
 #  define QT_NO_TRANSLATION
 #endif
-#ifndef QT_NO_TRANSLATION_UTF8
-#  define QT_NO_TRANSLATION_UTF8
-#endif
 
 /* ItemViews */
 
@@ -158,9 +144,6 @@
 #ifndef QT_NO_SHAREDMEMORY
 #  define QT_NO_SHAREDMEMORY
 #endif
-#ifndef QT_NO_SOUND
-#  define QT_NO_SOUND
-#endif
 #ifndef QT_NO_SYSTEMLOCALE
 #  define QT_NO_SYSTEMSEMAPHORE
 #endif
@@ -187,12 +170,6 @@
 #endif
 
 /* Networking */
-#ifndef QT_NO_COP
-#  define QT_NO_COP
-#endif
-#ifndef QT_NO_HOSTINFO
-#  define QT_NO_HOSTINFO
-#endif
 #ifndef QT_NO_HTTP
 #  define QT_NO_HTTP
 #endif
@@ -205,9 +182,6 @@
 #ifndef QT_NO_UDPSOCKET
 #  define QT_NO_UDPSOCKET
 #endif
-#ifndef QT_NO_URLINFO
-#  define QT_NO_URLINFO
-#endif
 #ifndef QT_NO_FTP
 #  define QT_NO_FTP
 #endif
@@ -216,12 +190,6 @@
 #ifndef QT_NO_COLORNAMES
 #  define QT_NO_COLORNAMES
 #endif
-#ifndef QT_NO_DIRECTPAINTER
-#  define QT_NO_DIRECTPAINTER
-#endif
-#ifndef QT_NO_PAINTONSCREEN
-#  define QT_NO_PAINTONSCREEN
-#endif
 #ifndef QT_NO_PAINT_DEBUG
 #  define QT_NO_PAINT_DEBUG
 #endif
@@ -235,92 +203,7 @@
 #  define QT_NO_CUPS
 #endif
 
-/* Qt for Embedded Linux */
-#ifndef QT_NO_QWSEMBEDWIDGET
-#  define QT_NO_QWSEMBEDWIDGET
-#endif
-#ifndef QT_NO_QWS_ALPHA_CURSOR
-#  define QT_NO_QWS_ALPHA_CURSOR
-#endif
-#ifndef QT_NO_QWS_CURSOR
-#  define QT_NO_QWS_CURSOR
-#endif
-#ifndef QT_NO_QWS_DECORATION_DEFAULT
-#  define QT_NO_QWS_DECORATION_DEFAULT
-#endif
-#ifndef QT_NO_QWS_DECORATION_STYLED
-#  define QT_NO_QWS_DECORATION_STYLED
-#endif
-#ifndef QT_NO_QWS_DECORATION_WINDOWS
-#  define QT_NO_QWS_DECORATION_WINDOWS
-#endif
-#ifndef QT_NO_QWS_MANAGER
-#  define QT_NO_QWS_MANAGER
-#endif
-#ifndef QT_NO_QWS_KEYBOARD
-#  define QT_NO_QWS_KEYBOARD
-#endif
-#ifndef QT_NO_QWS_MOUSE
-#  define QT_NO_QWS_MOUSE
-#endif
-#ifndef QT_NO_QWS_MOUSE_AUTO
-#  define QT_NO_QWS_MOUSE_AUTO
-#endif
-#ifndef QT_NO_QWS_MOUSE_MANUAL
-#  define QT_NO_QWS_MOUSE_MANUAL
-#endif
-#ifndef QT_NO_QWS_MULTIPROCESS
-#  define QT_NO_QWS_MULTIPROCESS
-#endif
-#ifndef QT_NO_QWS_SOUNDSERVER
-#  define QT_NO_QWS_SOUNDSERVER
-#endif
-#ifndef QT_NO_QWS_PROPERTIES
-#  define QT_NO_QWS_PROPERTIES
-#endif
-#ifndef QT_NO_QWS_PROXYSCREEN
-#  define QT_NO_QWS_PROXYSCREEN
-#endif
-#ifndef QT_NO_QWS_DYNAMICSCREENTRANSFORMATION
-#  define QT_NO_QWS_DYNAMICSCREENTRANSFORMATION
-#endif
-#ifndef QT_NO_QWS_LINUXFB
-#  define QT_NO_QWS_LINUXFB
-#endif
-#ifndef QT_NO_QWS_MOUSE_PC
-#  define QT_NO_QWS_MOUSE_PC
-#endif
-#ifndef QT_NO_QWS_MOUSE_LINUXTP
-#  define QT_NO_QWS_MOUSE_LINUXTP
-#endif
-#ifndef QT_NO_QWS_QPF
-#  define QT_NO_QWS_QPF
-#endif
-
-/* SVG */
-#ifndef QT_NO_SVG
-#  define QT_NO_SVG
-#endif
-#ifndef QT_NO_GRAPHICSSVGITEM
-#  define QT_NO_GRAPHICSSVGITEM
-#endif
-#ifndef QT_NO_SVGGENERATOR
-#  define QT_NO_SVGGENERATOR
-#endif
-#ifndef QT_NO_SVGRENDERER
-#  define QT_NO_SVGRENDERER
-#endif
-#ifndef QT_NO_SVGWIDGET
-#  define QT_NO_SVGWIDGET
-#endif
-
 /* Styles */
-#ifndef QT_NO_STYLE_MOTIF
-#  define QT_NO_STYLE_MOTIF
-#endif
-#ifndef QT_NO_STYLE_CDE
-#  define QT_NO_STYLE_CDE
-#endif
 #ifndef QT_NO_STYLE_STYLESHEET
 #  define QT_NO_STYLE_STYLESHEET
 #endif
@@ -347,14 +230,6 @@
 #ifndef QT_NO_DESKTOPSERVICES
 #  define QT_NO_DESKTOPSERVICES
 #endif
-#ifndef QT_NO_SCRIPT
-#  define QT_NO_SCRIPT
-#endif
 #ifndef QT_NO_SYSTEMTRAYICON
 #  define QT_NO_SYSTEMTRAYICON
 #endif
-
-/* Windows */
-#ifndef QT_NO_WIN_ACTIVEQT
-#  define QT_NO_WIN_ACTIVEQT
-#endif