diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-03-14 07:44:20 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-03-14 08:10:41 +0200 |
| commit | d31860a8d983b746177ce7e9e9ca1a1389d322a4 (patch) | |
| tree | 86b3720aacd53581387ee9224a9f524cb4c51afe /examples | |
| parent | 61c614240da9a2ecb5458e2796186339cbfd8762 (diff) | |
Qt5.3.0 fix for qmlmultigraph example and test
Change-Id: Ib93917992c9cd8e744d4f8156271614893f8679e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml | 2 | ||||
| -rw-r--r-- | examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml | 6 |
2 files changed, 4 insertions, 4 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" |