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
..
image	WinRT: Fix various test compilations	2013-10-02 12:36:05 +02:00
itemmodels	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
kernel	Merge remote-tracking branch 'origin/stable' into dev	2013-11-26 22:35:48 +01:00
math3d	Add operator[] to QVectorND classes	2013-08-27 17:50:40 +02:00
painting	tst_QPainter: fix a Q_DECLARE_METATYPE coming too late	2013-09-20 23:45:06 +02:00
qopengl	OpenGL autotests: verify create()/makeCurrent()	2013-09-30 14:18:38 +02:00
text	Merge remote-tracking branch 'origin/stable' into dev	2013-11-26 22:35:48 +01:00
util	Bugfix QDesktopServices on Windows	2013-07-11 10:56:49 +02:00
gui.pro	Remove qopengl auto test when Qt is not configured with OpenGL support	2013-09-02 14:59:02 +02:00