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/qmlscatter/doc/src | |
| 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/qmlscatter/doc/src')
| -rw-r--r-- | examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc b/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc index 7e842d36..425c23b8 100644 --- a/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc +++ b/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc @@ -44,7 +44,7 @@ \include examples-run.qdocinc - \section1 Application basics + \section1 Application Basics Before diving into the QML code, let's take a look at the application \c main.cpp. @@ -74,7 +74,7 @@ \snippet qmlscatter/main.cpp 2 - \section1 Setting up the graph + \section1 Setting up the Graph First we'll import all the QML modules we need: @@ -113,7 +113,7 @@ Then it's time to start feeding the graph some data. - \section1 Adding data to the graph + \section1 Adding Data to the Graph Let's create a \c Data item inside the \c mainView and name it \c seriesData: @@ -173,5 +173,5 @@ And we're done! - \section1 Example contents + \section1 Example Contents */ |