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/qmlsurface | |
| 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/qmlsurface')
| -rw-r--r-- | examples/qmlsurface/qml/qmlsurface/data.qml | 10 | ||||
| -rw-r--r-- | examples/qmlsurface/qml/qmlsurface/main.qml | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/examples/qmlsurface/qml/qmlsurface/data.qml b/examples/qmlsurface/qml/qmlsurface/data.qml index f9b008df..3ecc899f 100644 --- a/examples/qmlsurface/qml/qmlsurface/data.qml +++ b/examples/qmlsurface/qml/qmlsurface/data.qml @@ -20,18 +20,8 @@ import QtQuick 2.1 import QtDataVisualization 1.0 Item { - property alias mapping: surfaceMapping property alias model: dataModel - //! [2] - SurfaceDataMapping { - id: surfaceMapping - rowRole: "longitude" - columnRole: "latitude" - valueRole: "height" - } - //! [2] - //! [1] ListModel { id: dataModel diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml index a78ac796..f83dc9a9 100644 --- a/examples/qmlsurface/qml/qmlsurface/main.qml +++ b/examples/qmlsurface/qml/qmlsurface/main.qml @@ -74,8 +74,10 @@ Item { id: surfaceSeries ItemModelSurfaceDataProxy { - activeMapping: surfaceData.mapping itemModel: surfaceData.model + rowRole: "longitude" + columnRole: "latitude" + valueRole: "height" } } |