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
..
.gitignore	Moved integrationtests/* into other/	2011-11-30 09:30:22 +01:00
guitest.cpp	Fix build with Xcode 7.1 toolchain	2015-11-03 15:19:04 +00:00
guitest.h	Update copyright headers	2015-02-11 06:49:51 +00:00
macgui.pro	Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.	2015-09-01 16:57:46 +00:00
tst_macgui.cpp	tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 08:29:15 +00:00