qt/qtdatavis3d.git - Qt 3D data visualization framework

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/5.7' into 5.8	Liang Qi	2016-11-08	1	-5/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/datavisualization/bars/doc/src/bars.qdoc examples/datavisualization/custominput/doc/src/custominput.qdoc examples/datavisualization/customitems/doc/src/customitems.qdoc examples/datavisualization/draggableaxes/doc/src/draggableaxes.qdoc examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc examples/datavisualization/qmlaxisformatter/doc/src/qmlaxisformatter.qdoc examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc examples/datavisualization/qmlspectrogram/doc/src/qmlspectrogram.qdoc examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc examples/datavisualization/qmlsurfacelayers/doc/src/qmlsurfacelayers.qdoc examples/datavisualization/rotations/doc/src/rotations.qdoc examples/datavisualization/scatter/doc/src/scatter.qdoc examples/datavisualization/surface/doc/src/surface.qdoc examples/datavisualization/texturesurface/doc/src/texturesurface.qdoc examples/datavisualization/volumetric/doc/src/volumetric.qdoc src/datavisualization/doc/src/qtdatavisualization.qdoc Change-Id: Ic15e77b1fee0708a235bf21815f72b854981537a
\| *	Doc: Use capitalization in section titles	Topi Reinio	2016-11-02	1	-5/+5
\| \| \| \| \| \| \| \| \| \|	Change-Id: I3ea9dde5f98813716d754d292af1f005d33ba98e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* \|	Doc: Add section on running examples to example docs	Leena Miettinen	2016-11-02	1	-0/+2
\|/ \| \| \| \| \| \| \| \| \|	- Include examples-run.qdocinc from qtbase/doc/global. - Add section title to Audiolevels example docs. - Remove unnecessary leading paragraph from Custom Proxy example docs. - Remove information about running examples from Getting Started topic. Change-Id: I33e8189fa20bad38e52f424b0143b4031ad7872f Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
*	Copyright file update to GPL	Miikka Heikkinen	2016-01-12	1	-9/+17
\| \| \| \| \|	Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
*	Update license headers	Miikka Heikkinen	2015-10-20	1	-11/+14
\| \| \| \| \|	Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
*	Copyright header changes	Mika Salmela	2015-04-14	1	-3/+3
\| \| \| \| \| \| \|	Copyright header changes for 5.5. Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
*	Change copyright headers.	Miikka Heikkinen	2014-11-07	1	-7/+7
\| \| \| \| \| \|	Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
*	Added reflection to 2 examples	Tomi Korpipää	2014-08-26	1	-0/+0
\| \| \| \| \| \| \| \| \|	Task-number: QTRD-3290 + changed the theme in texturesurface example Change-Id: I872ef7048e21c3bbf9daa0b2a620c9cdfe2256c8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
*	Gradient to highlight series	Mika Salmela	2014-08-21	1	-16/+37
\| \| \| \| \| \| \|	Added a gradient to highlight series on textured surface example. Change-Id: I2fc17dfa79f986cf5b651d964eb3bcf5d65f1c80 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
*	Documentation for textured surface example	Mika Salmela	2014-08-15	1	-2/+81
\| \| \| \| \| \|	Change-Id: I517b02a31e342dc3ae2c1c80805f811f9d9670ff Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
*	Image for texture surface documentation	Mika Salmela	2014-08-13	1	-0/+0
\| \| \| \| \| \| \|	Also theme and font size adjustment. Change-Id: I2306deceb8d45cd95fadb27e3b1ff88260f49ac9 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
*	Textured surface example	Mika Salmela	2014-08-12	1	-0/+26
	Documentation once the feature set is final and code looking good. Size of image files adjusted when example area is locked. Change-Id: I7ff249ec3452d412a64ce029b33f7607965ffb3a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>