summaryrefslogtreecommitdiffstats
path: root/examples/qmlscatter/qml/qmlscatter/data.qml
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-15 10:39:15 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-15 12:43:19 +0200
commit27241b083df419f3a2de928c1d3f5dd8f6459030 (patch)
treecfe9c73f6b5b35a58a66700f0e4e5187120203ed /examples/qmlscatter/qml/qmlscatter/data.qml
parentcc22cc40e889b5b2f0e49ce32f660395cef865b7 (diff)
Enable giving series and proxies as child items in QML
Task-number: QTRD-2359 Change-Id: I37558b169bb60ee90993c1a8703da0c6745a9db0 Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'examples/qmlscatter/qml/qmlscatter/data.qml')
-rw-r--r--examples/qmlscatter/qml/qmlscatter/data.qml18
1 files changed, 2 insertions, 16 deletions
diff --git a/examples/qmlscatter/qml/qmlscatter/data.qml b/examples/qmlscatter/qml/qmlscatter/data.qml
index 74993135..523aceb0 100644
--- a/examples/qmlscatter/qml/qmlscatter/data.qml
+++ b/examples/qmlscatter/qml/qmlscatter/data.qml
@@ -21,8 +21,8 @@ import QtDataVisualization 1.0
Item {
//! [3]
- property alias proxy: modelProxy
- property alias series: scatterSeries
+ property alias mapping: scatterMapping
+ property alias model: dataModel
//! [3]
//! [1]
@@ -34,20 +34,6 @@ Item {
}
//! [1]
- //! [2]
- ItemModelScatterDataProxy {
- id: modelProxy
- activeMapping: scatterMapping
- itemModel: dataModel
- }
- //! [2]
-
- Scatter3DSeries {
- id: scatterSeries
- dataProxy: modelProxy
- itemLabelFormat: "X:@xLabel Y:@yLabel Z:@zLabel"
- }
-
//! [0]
ListModel {
id: dataModel