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
..
ioutils.cpp	consider qt resource paths absolute	2015-10-27 17:54:27 +00:00
ioutils.h	Update copyright headers	2015-02-11 06:49:51 +00:00
proitems.cpp	Remove Qt version checks.	2015-10-27 17:54:43 +00:00
proitems.h	add ProFile::tokPtrEnd()	2015-10-27 17:54:15 +00:00
qmake_global.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qmakebuiltins.cpp	fix raw data leak in $$sprintf()	2015-10-27 17:54:11 +00:00
qmakeevaluator.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
qmakeevaluator.h	qmake: mark some types movable	2015-07-08 12:31:00 +00:00
qmakeevaluator_p.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qmakeglobals.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
qmakeglobals.h	QMake: Add option to set qt.conf file.	2015-10-27 13:14:00 +00:00
qmakeparser.cpp	QmakeProject: Fix crash on updating sources	2015-10-27 17:53:50 +00:00
qmakeparser.h	add autotest for qmake parser	2015-02-25 13:55:12 +00:00
qmakevfs.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
qmakevfs.h	Update copyright headers	2015-02-11 06:49:51 +00:00