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
..
arch	Add x86 arch detection support for AVX512 and SHA instructions	2013-08-22 02:04:39 +02:00
common	Allow Clang to compile without libc++	2013-09-09 23:04:48 +02:00
mac/corewlan	Remove last traces of CoreServices/QT_NO_CORESERVICES on Mac	2013-10-11 18:49:25 +02:00
qpa	Disable app_bundle and lib_bundle when running configure tests	2013-07-16 13:44:18 +02:00
unix	Merge remote-tracking branch 'origin/stable' into dev	2013-11-26 22:35:48 +01:00
x11	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
.qmake.conf	Handle INCLUDE and LIB environment variables in config.tests for MinGW	2013-11-22 07:30:57 +01:00