qt/qt3d.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/5.6' into dev	Liang Qi	2016-01-26	1	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/doc/src/qt3dcollision-module.qdoc src/render/frontend/qcamera.cpp src/render/frontend/qcameralens.cpp Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
\| *	Doc: Use 'Qt 3D' instead of Qt3D consistently	Topi Reinio	2016-01-25	1	-3/+3
\| \| \| \| \| \| \| \| \| \|	Change-Id: I91c0d00c0116a05209239da399f4076316a51fc7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* \|	Unify license header usage	Antti Kokko	2016-01-26	1	-5/+5
\|/ \| \| \| \| \| \|	Updated FDL license. Change-Id: If5b261a12d1fba0d317848d3710e45e83f992fdf Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
*	Doc: Documentation clean up	Venugopal Shivashankar	2015-11-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	- Changed 'Qt3D' references to 'Qt 3D'. - Fixed incorrect \inqmlmodule instances. - Fixed broken \printuntil instances in the example docs. - Updated the namespace qualifier for a few class references. Change-Id: I250afe6843b10ed520f9ce5d7465203cc5c212c1 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
*	Doc: edit the Basic Shapes example docs	Leena Miettinen	2015-06-30	1	-12/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use standard structure for example docs. Refer to an include file in qtbase\doc\global that describes building and running from Qt Creator. Fix grammar and style issues according to the Qt writing guidelines. Change-Id: I515561325da34bee3ceeb522d35d2f38ea23256a Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
*	Documentation for basic shapes example	Mika Salmela	2015-06-18	2	-0/+37
\| \| \| \| \| \| \| \|	Add the documentation for the basic shapes example. Change-Id: I9a69198ddbd188ddaa7bd4ab0fae0dc2315719a9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
*	Reshape torus-cpp example to be basicshapes-cpp	Mika Salmela	2015-06-10	1	-0/+32
	Leave the cylinder-cpp example to show minimal code for setting up a basic element. Reshape torus-cpp to show several shapes available. Change-Id: Ic9dd7cb54258b5eb442ee0492ef4fc2e4b30f836 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>