Liang Qi ea438b2508 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qsysinfo.h src/corelib/kernel/qcoreapplication_win.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/plugins/platforms/windows/qwindowsglcontext.cpp src/plugins/platforms/windows/qwindowsglcontext.h Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978		2016-06-21 08:39:41 +02:00
..
image	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-21 08:39:41 +02:00
itemmodels	QStandardItemModel: Reset the flags on clear()	2016-02-17 11:39:13 +00:00
kernel	Blacklisting tst_QWindow::modalWithChildWindow on Ubuntu 16.04	2016-06-17 12:00:22 +00:00
math3d	Updated license headers	2016-01-21 18:55:18 +00:00
painting	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-05 14:22:45 +02:00
qopengl	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
qopenglconfig	Updated license headers	2016-01-21 18:55:18 +00:00
text	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00
util	QtGui: Remove Windows CE.	2016-03-30 17:35:41 +00:00
gui.pro	Add support for Apple tvOS	2016-05-17 16:11:23 +00:00