Liang Qi dbef41f43e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: examples/qtestlib/tutorial5/containers.cpp examples/widgets/tools/tools.pro src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/network/kernel/qdnslookup_unix.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/testlib/qtestcase.cpp tools/configure/configureapp.cpp Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8		2016-05-06 15:36:44 +02:00
..
qaction	Updated license headers	2016-01-21 18:55:18 +00:00
qactiongroup	Updated license headers	2016-01-21 18:55:18 +00:00
qapplication	Updated license headers	2016-01-21 18:55:18 +00:00
qboxlayout	Updated license headers	2016-01-21 18:55:18 +00:00
qdesktopwidget	Updated license headers	2016-01-21 18:55:18 +00:00
qformlayout	Updated license headers	2016-01-21 18:55:18 +00:00
qgridlayout	Updated license headers	2016-01-21 18:55:18 +00:00
qlayout	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qshortcut	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00: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-05-06 15:36:44 +02:00
qwidget_window	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-23 08:29:43 +01: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