Liang Qi 28628a5d5e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/plugins/platforms/eglfs/qeglfshooks.cpp Change-Id: I483f0dbd876943b184803f0fe65a0c686ad75db2		2016-10-22 21:19:57 +02:00
..
qaction	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-22 21:19:57 +02:00
qactiongroup	Updated license headers	2016-01-21 18:55:18 +00:00
qapplication	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-22 21:19:57 +02:00
qboxlayout	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-28 11:51:35 +02:00
qdesktopwidget	Updated license headers	2016-01-21 18:55:18 +00:00
qformlayout	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-22 21:19:57 +02:00
qgridlayout	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-28 11:51:35 +02:00
qlayout	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qshortcut	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-08 17:15:55 +02:00
qsizepolicy	Updated license headers	2016-01-21 18:55:18 +00:00
qstackedlayout	Updated license headers	2016-01-21 18:55:18 +00:00
qtooltip	Updated license headers	2016-01-21 18:55:18 +00:00
qwidget	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-13 15:18:02 +02:00
qwidget_window	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-06 09:04:55 +02:00
qwidgetaction	Updated license headers	2016-01-21 18:55:18 +00:00
qwidgetmetatype	Updated license headers	2016-01-21 18:55:18 +00:00
qwidgetsvariant	Updated license headers	2016-01-21 18:55:18 +00:00
qwindowcontainer	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-02 15:57:44 +01:00
kernel.pro	Introducing QWidget::createWindowContainer()	2013-01-25 14:11:07 +01:00