Liang Qi 0e80d28aa5 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp src/qml/qml/qqmlimport.cpp src/quick/items/context2d/qquickcontext2dtexture_p.h tools/qmleasing/splineeditor.h Change-Id: I8f6630fcac243824350986c8e9f4bd6483bf20b5		2016-12-14 19:01:23 +01:00
..
qquickviewcomparison	Enable shader disk cache in Qt Quick	2016-11-27 22:10:41 +00:00
quickwidget	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-14 19:01:23 +01:00
quickwidgets.pro	Add a QQuickWidget - QQuickView comparison example	2014-06-19 20:55:57 +02:00