qt5base-lts/tests/auto/corelib/itemmodels
Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/global/qglobal.cpp
	src/corelib/tools/qstring.cpp
	src/network/socket/qabstractsocket.cpp
	src/network/socket/qnativesocketengine_unix.cpp
	src/plugins/platforms/eglfs/api/qeglfsglobal.h

Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
2016-08-16 07:58:32 +02:00
..
qabstractitemmodel Updated license headers 2016-01-21 18:55:18 +00:00
qabstractproxymodel Updated license headers 2016-01-21 18:55:18 +00:00
qidentityproxymodel Updated license headers 2016-01-21 18:55:18 +00:00
qitemmodel QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
qitemselectionmodel Updated license headers 2016-01-21 18:55:18 +00:00
qsortfilterproxymodel Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-13 01:05:02 +02:00
qstringlistmodel Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-13 01:05:02 +02:00
itemmodels.pro exclude gui-needing tests from -no-gui build 2013-10-18 20:05:27 +02:00