diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-03-14 08:17:07 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-03-14 08:17:07 +0200 |
commit | bc3e1b455103fe056a43cef45f4b197ea9048dc1 (patch) | |
tree | 86b3720aacd53581387ee9224a9f524cb4c51afe | |
parent | 13cec785e301dff3cf8baf46be38a7f8f1412eb4 (diff) | |
parent | d31860a8d983b746177ce7e9e9ca1a1389d322a4 (diff) |
Merge branch 'develop'
Change-Id: Ia3c4043e502250d0375e6eb39c85fa40b591ae77
4 files changed, 8 insertions, 8 deletions
diff --git a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml index 43152e50..d7e12687 100644 --- a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml +++ b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml @@ -19,7 +19,7 @@ import QtQuick 2.1 Item { - property alias data: dataModel + property alias sharedData: dataModel ListModel { id: dataModel diff --git a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml index 9f0227ae..38943c08 100644 --- a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml +++ b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml @@ -60,7 +60,7 @@ Rectangle { Surface3DSeries { itemLabelFormat: "Pop density at (@xLabel N, @zLabel E): @yLabel" ItemModelSurfaceDataProxy { - itemModel: data.data + itemModel: data.sharedData // The surface data points are not neatly lined up in rows and columns, // so we define explicit row and column roles. rowRole: "row" @@ -136,7 +136,7 @@ Rectangle { Scatter3DSeries { itemLabelFormat: "Pop density at (@xLabel N, @zLabel E): @yLabel" ItemModelScatterDataProxy { - itemModel: data.data + itemModel: data.sharedData // Mapping model roles to scatter series item coordinates. xPosRole: "latitude" zPosRole: "longitude" @@ -168,7 +168,7 @@ Rectangle { name: "Population density" ItemModelBarDataProxy { - itemModel: data.data + itemModel: data.sharedData // Mapping model roles to bar series rows, columns, and values. rowRole: "row" columnRole: "col" diff --git a/tests/qmlmultiwindow/qml/qmlmultiwindow/Data.qml b/tests/qmlmultiwindow/qml/qmlmultiwindow/Data.qml index 43152e50..e188b2af 100644 --- a/tests/qmlmultiwindow/qml/qmlmultiwindow/Data.qml +++ b/tests/qmlmultiwindow/qml/qmlmultiwindow/Data.qml @@ -19,7 +19,7 @@ import QtQuick 2.1 Item { - property alias data: dataModel + property alias myData: dataModel ListModel { id: dataModel diff --git a/tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml b/tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml index fc7626b3..7dfe0bec 100644 --- a/tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml +++ b/tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml @@ -102,7 +102,7 @@ Rectangle { Surface3DSeries { itemLabelFormat: "Pop density at (@xLabel N, @zLabel E): @yLabel" ItemModelSurfaceDataProxy { - itemModel: data.data + itemModel: data.myData // The surface data points are not neatly lined up in rows and columns, // so we define explicit row and column roles. rowRole: "row" @@ -184,7 +184,7 @@ Rectangle { Scatter3DSeries { itemLabelFormat: "Pop density at (@xLabel N, @zLabel E): @yLabel" ItemModelScatterDataProxy { - itemModel: data.data + itemModel: data.myData // Mapping model roles to scatter series item coordinates. xPosRole: "latitude" zPosRole: "longitude" @@ -216,7 +216,7 @@ Rectangle { name: "Population density" ItemModelBarDataProxy { - itemModel: data.data + itemModel: data.myData // Mapping model roles to bar series rows, columns, and values. rowRole: "row" columnRole: "col" |