diff options
| author | Mika Salmela <mika.salmela@digia.com> | 2013-12-18 11:50:03 +0200 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@digia.com> | 2013-12-18 11:51:20 +0200 |
| commit | 07aba602fc82ac31684988f8e8e22521d2b3c982 (patch) | |
| tree | 7ae1da139e8661bf157f996fe71844031d2995f4 /src/datavisualization/doc/src/qtdatavisualization-index.qdoc | |
| parent | cf0cf6ca67aec8ae480bb705443ea17f5ab9f9e2 (diff) | |
| parent | ea0442bc81ae034d22c5742b6075dee993fdd54d (diff) | |
Merge branch 'develop' into mergebranch
Conflicts:
examples/qmlbars/qml/qmlbars/main.qml
examples/qmlscatter/qml/qmlscatter/main.qml
examples/qmlsurface/qml/qmlsurface/main.qml
src/datavisualization/data/qitemmodelbardatamapping.cpp
src/datavisualization/data/qitemmodelscatterdatamapping.cpp
src/datavisualization/data/qitemmodelsurfacedatamapping.cpp
src/datavisualization/engine/drawer.cpp
Change-Id: I731ebdb2cc5cee8f2cb32becee96d1fc1b3e5de1
Diffstat (limited to 'src/datavisualization/doc/src/qtdatavisualization-index.qdoc')
| -rw-r--r-- | src/datavisualization/doc/src/qtdatavisualization-index.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc index 456f8ac5..c37d98a4 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc @@ -32,10 +32,10 @@ \li Uses OpenGL for rendering the data \li QML2 support \li Customizable axes for data - control viewable data window with axis ranges - \li Customizable input handling (upcoming feature - not supported in technology preview) - \li Customizable scene handling - full control of cameras and lights (upcoming feature - - not supported in technology preview) - \li Customizable themes (upcoming feature - not supported in technology preview) + \li Customizable input handling + \li Customizable scene handling - full control of viewports + (upcoming feature - not fully supported in alpha) + \li Customizable themes \endlist \section1 Getting Started @@ -62,8 +62,8 @@ \section1 Articles \list - \li \l{Qt Data Visualization Data Handling}{Data input} - \li \l{Qt Data Visualization Interacting with Data}{Interacting with visualized data} + \li \l{Qt Data Visualization Data Handling}{Data Handling} + \li \l{Qt Data Visualization Interacting with Data}{Interacting with Data} \endlist \section1 References |