Liang Qi 42f485231c Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: src/quick/items/context2d/qquickcanvasitem.cpp src/quickwidgets/qquickwidget.cpp tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp Change-Id: Idf279cb88e0df2a383489af5b6afdf04d04ae611		2016-06-30 13:28:35 +02:00
..
qquickwidget	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-30 13:28:35 +02:00
quickwidgets.pro	Add grabFramebuffer() to QQuickWidget and use it in the autotest	2014-07-01 14:20:57 +02:00