diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-14 14:55:10 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-14 14:55:34 +0200 |
| commit | 4a8a1e06f12a8b9d16696a4c559c325f771cad0c (patch) | |
| tree | d7dc653c903ba26fdb7ea19dcaa97213f0c6d9e0 /examples | |
| parent | 0f324106dcda14089ce28aa5db585a1ef65f43da (diff) | |
| parent | dfcc8c6d756f9a194cfcdc0eb1eb47af8c1a4bb2 (diff) | |
Merge branch 'develop'
Change-Id: I1ac2c37e8731e64ba005a742d6e4923ff3ded01b
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc index 723ad826..352e2a36 100644 --- a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc +++ b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc @@ -49,7 +49,7 @@ \snippet qmloscilloscope/datasource.cpp 0 - The secod method, \c update(), copies one set of the cached data into another array, which we + The second method, \c update(), copies one set of the cached data into another array, which we set to the data proxy of the series by calling QSurfaceDataProxy::resetArray(). We reuse the same array if the array dimensions have not changed to minimize overhead: |