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
..
arch	Update the list of x86 instruction set extensions enabled by GCC	2015-07-28 23:55:04 +00:00
common	Replace qdtoa and qstrtod implementation by a 3rdparty library	2015-11-02 17:00:50 +00:00
mac/corewlan	Fixed license headers	2015-02-17 18:46:09 +00:00
qpa	Support for Wayland servers on i.MX6	2015-11-02 09:43:29 +00:00
unix	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
win/directwrite	Windows: Include DirectWrite support by default if available	2015-07-21 08:21:34 +00:00
x11	configure: Remove unused options -xvideo and -xinerama	2015-10-14 09:30:21 +00: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