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
..
configure_pch.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
configure.pro	Improve path search in configure.	2012-11-05 17:17:01 +01:00
configureapp.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-11-26 22:35:48 +01:00
configureapp.h	bring the windows configure -qconfig handling in line with the unix one	2013-10-30 23:26:58 +01:00
environment.cpp	Fix configure warnings on Windows 7 with MSVC2010.	2013-09-25 13:39:14 +02:00
environment.h	add support for Visual Studio 2013	2013-07-04 12:54:58 +02:00
main.cpp	Detect architecture before auto detection	2013-11-14 19:26:20 +01:00
Makefile.mingw	Don't compile qcryptographichash into configure.exe	2013-08-15 01:30:54 +02:00
Makefile.win32	Don't compile qcryptographichash into configure.exe	2013-08-15 01:30:54 +02:00
tools.cpp	fix configure -commercial	2013-09-11 15:52:51 +02:00
tools.h	fix configure -commercial	2013-09-11 15:52:51 +02:00