Liang Qi 3f5c279083 Merge remote-tracking branch 'origin/5.7' into 5.8 ... 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		2016-11-08 11:46:38 +01:00
..
doc	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-08 11:46:38 +01:00
qml/qmlspectrogram	Copyright file update to GPL	2016-01-12 15:38:13 +00:00
main.cpp	Copyright file update to GPL	2016-01-12 15:38:13 +00:00
qmlspectrogram.pro	Polar graph support, phase one	2014-06-26 10:43:30 +03:00
qmlspectrogram.qrc	Polar graph support, phase one	2014-06-26 10:43:30 +03:00