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
..
dialogs	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00
effects	QtWidgets: Remove Windows CE.	2016-04-07 10:24:45 +00:00
gestures	autotests: use QTest::createTouchDevice()	2016-06-10 13:07:17 +00:00
graphicsview	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-16 07:58:32 +02:00
itemviews	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-09 17:59:51 +02:00
kernel	remove redundant x11 handling	2016-08-10 15:43:11 +00:00
styles	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00
util	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
widgets	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
widgets.pro