diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-08 11:30:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-08 11:46:38 +0100 |
| commit | 3f5c27908314074f177454ddcb1c18fce123fa6c (patch) | |
| tree | 4fca1ae043413014e997a04a562e7ee6b4ae9270 /examples/datavisualization/qmlaxisformatter/doc/src/qmlaxisformatter.qdoc | |
| parent | 779f6d8c23e75f12a830a4229db55f28ad1537b7 (diff) | |
| parent | 90aff7026205d71efde65f1783a06af82e528287 (diff) | |
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
Diffstat (limited to 'examples/datavisualization/qmlaxisformatter/doc/src/qmlaxisformatter.qdoc')
| -rw-r--r-- | examples/datavisualization/qmlaxisformatter/doc/src/qmlaxisformatter.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/datavisualization/qmlaxisformatter/doc/src/qmlaxisformatter.qdoc b/examples/datavisualization/qmlaxisformatter/doc/src/qmlaxisformatter.qdoc index fb7fdfc1..bdeee883 100644 --- a/examples/datavisualization/qmlaxisformatter/doc/src/qmlaxisformatter.qdoc +++ b/examples/datavisualization/qmlaxisformatter/doc/src/qmlaxisformatter.qdoc @@ -45,7 +45,7 @@ \include examples-run.qdocinc - \section1 Custom axis formatter + \section1 Custom Axis Formatter Customizing axis formatters requires subclassing the QValue3DAxisFormatter, which cannot be done in QML code alone. In this example we want an axis that interprets the float values as |