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
..
animation	qevent.h: Add fixme comments to remove include directives for Qt 6.	2015-10-02 06:37:03 +00:00
codecs	Tests: Fix single-character string literals.	2015-10-13 18:14:27 +00:00
global	Implement qt_is_{inf,nan,finite} using std. library functions.	2015-10-30 13:07:19 +00:00
io	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
itemmodels	tests/auto/corelib: Remove some placeholder formatting.	2015-10-22 03:54:29 +00:00
json	Tests: Fix single-character string literals.	2015-10-13 18:14:27 +00:00
kernel	tests/auto/corelib: Remove some placeholder formatting.	2015-10-22 03:54:29 +00:00
mimetypes	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-14 15:45:35 +02:00
plugin	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
statemachine	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
thread	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
tools	QLocale: Return overflowing numbers from asciiToDouble()	2015-11-04 17:32:12 +00:00
xml	tests/auto/corelib: Remove some placeholder formatting.	2015-10-22 03:54:29 +00:00
corelib.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00