Liang Qi 5d4cbf4094 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: src/qml/jsruntime/qv4object_p.h Change-Id: Iff4d3aba7710a999b8befdc493cbe959e1ce02f9		2016-11-23 10:49:37 +01:00
..
customgeometry	Fix building with QT_NO_OPENGL defined	2016-05-06 19:17:20 +00:00
graph	Shader examples: initialize all members	2016-08-11 08:06:54 +00:00
openglunderqml	Updated license headers	2016-01-20 11:46:11 +00:00
rendernode	rendernode example: do not rely on build-time shader compilation	2016-11-22 12:24:59 +00:00
sgengine	examples: replace 'foreach' with 'range for'	2016-09-03 16:50:01 +00:00
shared	Fixed license headers	2015-02-17 13:33:18 +00:00
simplematerial	Doc: minor spelling issue	2016-07-19 08:38:43 +00:00
textureinsgnode	Fixed license headers	2015-02-17 13:33:18 +00:00
textureinthread	examples: replace 'foreach' with 'range for'	2016-09-03 16:50:01 +00:00
threadedanimation	Updated license headers	2016-01-20 11:46:11 +00:00
twotextureproviders	Port examples to new connection syntax.	2015-07-22 22:16:19 +00:00
scenegraph.pro	Adjust decarative after qtConfig changes in qtbase	2016-08-19 11:16:18 +00:00