diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-26 14:53:50 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-27 11:29:30 +0200 |
commit | 7c942cc0f497fe7e61ce6a10fce45771c0858e09 (patch) | |
tree | aab5d2285b8e583f3565e305e0818a49503cf95c /examples/qmlcustominput/qml | |
parent | e029d0ea1d486dd3dbbfa4519a2125da202f22e4 (diff) |
Integrated item model mappings to item model proxies
Separate mapping object was redundant.
Task-number: QTRD-2564
Change-Id: I6b1a23ba52dbb184f46df0fdd64184eeb145c0c3
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'examples/qmlcustominput/qml')
-rw-r--r-- | examples/qmlcustominput/qml/qmlcustominput/data.qml | 8 | ||||
-rw-r--r-- | examples/qmlcustominput/qml/qmlcustominput/main.qml | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/examples/qmlcustominput/qml/qmlcustominput/data.qml b/examples/qmlcustominput/qml/qmlcustominput/data.qml index bd81becd..71c544a4 100644 --- a/examples/qmlcustominput/qml/qmlcustominput/data.qml +++ b/examples/qmlcustominput/qml/qmlcustominput/data.qml @@ -21,16 +21,8 @@ import QtDataVisualization 1.0 import QtQuick.XmlListModel 2.0 Item { - property alias mapping: scatterMapping property alias model: dataModel - ScatterDataMapping { - id: scatterMapping - xPosRole: "xPos" - yPosRole: "yPos" - zPosRole: "zPos" - } - ListModel { id: dataModel ListElement{ xPos: -10.0; yPos: 5.0; zPos: -5.0 } diff --git a/examples/qmlcustominput/qml/qmlcustominput/main.qml b/examples/qmlcustominput/qml/qmlcustominput/main.qml index 83fa0980..2ab39ca8 100644 --- a/examples/qmlcustominput/qml/qmlcustominput/main.qml +++ b/examples/qmlcustominput/qml/qmlcustominput/main.qml @@ -51,8 +51,10 @@ Item { itemLabelFormat: "X:@xLabel Y:@yLabel Z:@zLabel" ItemModelScatterDataProxy { - activeMapping: graphData.mapping itemModel: graphData.model + xPosRole: "xPos" + yPosRole: "yPos" + zPosRole: "zPos" } } } |