Liang Qi 4159ee8405 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: config.tests/unix/ptrsize.test configure src/corelib/global/qnamespace.h src/network/socket/qabstractsocket.cpp tests/auto/other/networkselftest/networkselftest.pro Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672		2015-11-04 20:18:14 +01:00
..
Makefile.mingw	Move the official Qt version from qglobal.h to .qmake.conf	2015-10-14 20:12:57 +00:00
Makefile.win32	Remove support for MSVC earlier than 2012	2015-10-27 23:26:52 +00:00
configure.pro	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00
configure_pch.h	Update copyright headers	2015-02-11 06:49:51 +00:00
configureapp.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
configureapp.h	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-14 15:45:35 +02:00
environment.cpp	Remove support for MSVC earlier than 2012	2015-10-27 23:26:52 +00:00
environment.h	Add mingw GCC Version to qconfig.pri	2015-03-25 11:13:19 +00:00
main.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
tools.cpp	Run license checker in qmake	2015-05-27 10:23:10 +00:00
tools.h	Update copyright headers	2015-02-11 06:49:51 +00:00