Frederik Gladhorn 4a8273a6fc 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		2013-11-26 22:35:48 +01:00
..
q_func_info	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qflags	tst_QFlags: make constExpr() check compile on clang trunk	2013-11-07 03:06:29 +01:00
qgetputenv	Add qunsetenv(), next to qputenv() and friends.	2013-02-07 01:22:40 +01:00
qglobal	QIntegerForSize: add test	2013-11-06 00:35:43 +01:00
qglobalstatic	Fix Q_GLOBAL_STATIC support for exceptions	2013-02-28 23:43:46 +01:00
qlogging	Print non-default categories in default message handler	2013-10-16 17:10:15 +02:00
qnumeric	Say hello to qFloatDistance()	2013-09-27 07:57:23 +02:00
qrand	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
qtendian	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
global.pro	Enable QGlobalStatic autotest.	2013-02-28 23:43:50 +01:00