Liang Qi 905329200f Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: src/gui/image/qpixmap.cpp src/widgets/kernel/qformlayout.cpp Change-Id: I8a8391a202adf7f18464a22ddf0a6c4974eab692		2016-10-11 07:40:32 +02:00
..
image	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-11 07:40:32 +02:00
itemmodels	QStandardItemModel: Reset the flags on clear()	2016-02-17 11:39:13 +00:00
kernel	Fix test for targets without process support	2016-09-23 07:32:44 +00:00
math3d	Updated license headers	2016-01-21 18:55:18 +00:00
painting	QColor: provide QLatin1String overloads of functions taking QString	2016-09-23 04:39:41 +00:00
qopengl	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
qopenglconfig	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-25 16:12:11 +02:00
text	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-06 20:12:27 +02:00
util	Fix test for WinRT	2016-09-23 07:20:53 +00:00
gui.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00