Liang Qi 60300fda46 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: .qmake.conf Change-Id: I9d87ed86e95b5901a86cc3aa65d7ac39b0b708c2		2017-01-14 22:17:32 +01:00
..
customgeometry	Fix building with QT_NO_OPENGL defined	2016-05-06 19:17:20 +00:00
graph	graph example: Fix MSVC warning about truncation of 'double'	2017-01-10 14:55:55 +00:00
openglunderqml	Enable shader disk cache in Qt Quick	2016-11-27 22:10:41 +00:00
rendernode	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-14 19:01:23 +01:00
sgengine	examples: replace 'foreach' with 'range for'	2016-09-03 16:50:01 +00:00
shared	Enable shader disk cache in Qt Quick	2016-11-27 22:10:41 +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	examples\..\scenegraph.pro: Remove duplicate entry textureinsgnode	2016-12-01 14:54:10 +00:00