Liang Qi 158a3a4159 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/qiodevice_p.h src/corelib/kernel/qvariant_p.h src/corelib/tools/qsimd.cpp src/gui/kernel/qguiapplication.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a		2016-01-21 08:17:21 +01:00
..
.gitignore	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
externaltests.cpp	tst_QSharedPointer: Add jom.exe to the list of make tools to be searched.	2015-10-02 09:34:35 +00:00
externaltests.h	Update copyright headers	2015-02-11 06:49:51 +00:00
externaltests.pri	remove pointless conditional defines	2015-11-16 14:40:20 +00:00
forwarddeclared.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
forwarddeclared.h	Update copyright headers	2015-02-11 06:49:51 +00:00
nontracked.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
nontracked.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qsharedpointer.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qsharedpointer.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00
wrapper.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
wrapper.h	Update copyright headers	2015-02-11 06:49:51 +00:00