qtdeclarative/examples/quick/quickwidgets
Liang Qi f04c2c40fd Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
	src/qml/jsruntime/qv4variantobject.cpp
	src/qml/types/qquickworkerscript.cpp
	src/quick/scenegraph/util/qsgdefaultpainternode_p.h
	tools/qmljs/qmljs.cpp

Change-Id: I876242714ec8c046238d8fd673a5ace2455b2b59
2016-10-18 08:33:26 +02:00
..
qquickviewcomparison Add potentially missing include to qquickviewcomparison example 2016-06-21 12:53:00 +00:00
quickwidget Merge remote-tracking branch 'origin/5.8' into dev 2016-10-18 08:33:26 +02:00
quickwidgets.pro Add a QQuickWidget - QQuickView comparison example 2014-06-19 20:55:57 +02:00