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
..
qdir	WinRT: Fix various test compilations	2013-10-02 12:36:05 +02:00
qdiriterator	WinRT: Fix various test compilations	2013-10-02 12:36:05 +02:00
qfile	WinRT: Fix various test compilations	2013-10-02 12:36:05 +02:00
qfileinfo	WinRT: Fix various test compilations	2013-10-02 12:36:05 +02:00
qiodevice	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qprocess	Fix test compilation on WinRT	2013-11-26 20:29:09 +01:00
qtemporaryfile	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qurl	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
io.pro	benchmarks: Re-enable QFileInfo build by removing canonicalFileNamePerformance.	2013-07-04 17:00:17 +02:00