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
..
integrity	fix warnings about unused variables & parameters	2013-11-04 19:50:05 +01:00
mac	Show all of the internal included files in the Supporting Files group	2013-11-22 12:53:04 +01:00
unix	Merge remote-tracking branch 'origin/release' into stable	2013-11-26 10:51:34 +01:00
win32	Merge remote-tracking branch 'origin/stable' into dev	2013-11-26 22:35:48 +01:00
makefile.cpp	adequately shell-escape generated sed commands	2013-11-23 19:58:11 +01:00
makefile.h	adequately shell-escape generated sed commands	2013-11-23 19:58:11 +01:00
makefiledeps.cpp	remove support for Qtopia's QOM_OBJECT macro	2013-08-26 12:21:40 +02:00
makefiledeps.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
metamakefile.cpp	actually use the temp variable we just assigned ...	2013-03-12 18:54:59 +01:00
metamakefile.h	remove some cryptic code relating to output directories	2013-03-07 00:42:56 +01:00
projectgenerator.cpp	Changed digia contact details to */legal, updated licenses	2013-07-20 11:21:46 +02:00
projectgenerator.h	Changed digia contact details to */legal, updated licenses	2013-07-20 11:21:46 +02:00
xmloutput.cpp	remove pointless QString::arg call	2013-05-30 12:16:52 +02:00
xmloutput.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00