summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc20
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc4
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc4
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc2
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2_plugin.cpp4
5 files changed, 17 insertions, 17 deletions
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc
index c132e251..cc8b6541 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc
@@ -17,7 +17,7 @@
****************************************************************************/
/*!
- \qmltype AbstractDeclarative
+ \qmltype AbstractGraph3D
\inmodule QtDataVisualization
This type is the base class for all 3D visualizations in Qt Quick 2.
@@ -34,46 +34,46 @@
*/
/*!
- \qmlproperty AbstractDeclarative.SelectionMode AbstractDeclarative::selectionMode
+ \qmlproperty AbstractGraph3D.SelectionMode AbstractGraph3D::selectionMode
Active selection mode in the visualization.
*/
/*!
- \qmlproperty AbstractDeclarative.LabelTransparency AbstractDeclarative::labelTransparency
+ \qmlproperty AbstractGraph3D.LabelTransparency AbstractGraph3D::labelTransparency
Label transparency.
*/
/*!
- \qmlproperty AbstractDeclarative.ShadowQuality AbstractDeclarative::shadowQuality
+ \qmlproperty AbstractGraph3D.ShadowQuality AbstractGraph3D::shadowQuality
Shadow quality.
*/
/*!
- \qmlproperty AbstractDeclarative.CameraPreset AbstractDeclarative::cameraPreset
+ \qmlproperty AbstractGraph3D.CameraPreset AbstractGraph3D::cameraPreset
Camera preset.
*/
/*!
- \qmlproperty AbstractDeclarative.ColorTheme AbstractDeclarative::theme
+ \qmlproperty AbstractGraph3D.ColorTheme AbstractGraph3D::theme
Theme of the graph. Theme affects visualization colors, label colors, text color, background color, window
color and grid color. Lighting is also adjusted by themes.
*/
/*!
- \qmlproperty font AbstractDeclarative::font
+ \qmlproperty font AbstractGraph3D::font
Font used for labels.
*/
/*!
- \qmlproperty bool AbstractDeclarative::gridVisible
+ \qmlproperty bool AbstractGraph3D::gridVisible
Grid visibility. If false, grid lines are not drawn.
*/
/*!
- \qmlproperty bool AbstractDeclarative::backgroundVisible
+ \qmlproperty bool AbstractGraph3D::backgroundVisible
Background visibility. If false, background is not drawn.
*/
/*!
- \qmlproperty string AbstractDeclarative::itemLabelFormat
+ \qmlproperty string AbstractGraph3D::itemLabelFormat
Label format of single item labels, e.g. a selected datapoint.
*/
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc
index b36d6f83..fac53960 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc
@@ -18,7 +18,7 @@
/*!
* \qmltype Bars3D
- * \inherits AbstractDeclarative
+ * \inherits AbstractGraph3D
* \inmodule QtDataVisualization
*
* This type enables developers to render bar graphs in 3D with Qt Quick 2.
@@ -44,7 +44,7 @@
*
* Calling this method overrides colors from theme.
*
- * \sa AbstractDeclarative::theme
+ * \sa AbstractGraph3D::theme
*
* \warning This method is subject to change.
*/
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc
index 672dd5b7..d78cc3a7 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-qml-scatter3d.qdoc
@@ -18,7 +18,7 @@
/*!
\qmltype Scatter3D
- \inherits AbstractDeclarative
+ \inherits AbstractGraph3D
\inmodule QtDataVisualization
This type enables developers to render scatter graphs in 3D with Qt Quick 2.
@@ -44,7 +44,7 @@
*
* Calling this method overrides colors from theme.
*
- * \sa AbstractDeclarative::theme
+ * \sa AbstractGraph3D::theme
*
* \warning This method is subject to change.
*/
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc
index 069fa9e9..21c3f474 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc
@@ -18,7 +18,7 @@
/*!
\qmltype Surface3D
- \inherits AbstractDeclarative
+ \inherits AbstractGraph3D
\inmodule QtDataVisualization
This type enables developers to render surface plots in 3D with Qt Quick 2.
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
index 5bb9ed3a..f5642831 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
@@ -41,8 +41,8 @@ void Datavis3Dqml2Plugin::registerTypes(const char *uri)
QLatin1String("Trying to create uncreatable: ScatterDataProxy."));
qmlRegisterUncreatableType<QSurfaceDataProxy>(uri, 1, 0, "SurfaceDataProxy",
QLatin1String("Trying to create uncreatable: SurfaceDataProxy."));
- qmlRegisterUncreatableType<AbstractDeclarative>(uri, 1, 0, "AbstractDeclarative",
- QLatin1String("Trying to create uncreatable: AbstractDeclarative."));
+ qmlRegisterUncreatableType<AbstractDeclarative>(uri, 1, 0, "AbstractGraph3D",
+ QLatin1String("Trying to create uncreatable: AbstractGraph3D."));
qmlRegisterType<QItemModelBarDataMapping>(uri, 1, 0, "BarDataMapping");
qmlRegisterType<QItemModelScatterDataMapping>(uri, 1, 0, "ScatterDataMapping");