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
..
lib	Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.	2015-09-01 16:57:46 +00:00
lib2	Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.	2015-09-01 16:57:46 +00:00
library_path	Moving relevant tests to corelib/plugin	2011-09-01 12:42:51 +02:00
tst	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
.gitignore	Remove mention of Trolltech in qlibrary autotest.	2011-12-28 04:48:06 +01:00
qlibrary.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qlibrary.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00