summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorTitta Heikkala <titta.heikkala@digia.com>2013-10-02 09:16:18 +0300
committerTitta Heikkala <titta.heikkala@digia.com>2013-10-02 09:29:41 +0300
commit7768c3fc60b8b4ace9f0e83c3b5e713363ccd9f7 (patch)
tree95c3fbc622ad659202e67a6e7d43c17253fffc89 /doc
parent57e2d8f758e8315cec06c3ff9194b77456503f0f (diff)
Remove qmlcustommodel demo
Qml Custom Model demo removed for now. If there's need for similar demo in the future a better one should be created. Task-number: QTRD-1928 Change-Id: I1766dfca4e2a7358f47c40f0e0b7258768c16b22 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/demos-qmlcustommodel.qdoc29
-rw-r--r--doc/src/demos.qdoc16
2 files changed, 5 insertions, 40 deletions
diff --git a/doc/src/demos-qmlcustommodel.qdoc b/doc/src/demos-qmlcustommodel.qdoc
deleted file mode 100644
index 2ba671c4..00000000
--- a/doc/src/demos-qmlcustommodel.qdoc
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
- \example demos/qmlcustommodel
- \title QML Custom Model
- \subtitle
-
- This example shows how to use your own QAbstractItemModel derived data model as a data source for a ChartView.
- \image demos_qmlcustommodel.png
-
- First we create a ChartView:
- \snippet ../demos/qmlcustommodel/qml/qmlcustommodel/main.qml 1
-
- Then our data model that contains the shares of the top 5 car manufacturers in Finland for the last 5 years. The model
- could be constructed from various sources depending on the use case, but here we use static data for the sake of
- simplicity. Check customtablemodel.cpp, declarativemodel.cpp, and plugin.cpp to see how to make your own
- QAbstractItemModel accessible on QML.
- \snippet ../demos/qmlcustommodel/qml/qmlcustommodel/main.qml 2
-
- Then we create several series as children for the same ChartView. First a pie series that illustrates the shares of
- the car manufacturers in Finland in 2011:
- \snippet ../demos/qmlcustommodel/qml/qmlcustommodel/main.qml 3
-
- And one line series for each manufacturer presenting the share between 2007-2011, for example for Volkswagen.
- The series is not visible by default. It is made visible when the user clicks on the Volkswagen slice
- on the pie series:
- \snippet ../demos/qmlcustommodel/qml/qmlcustommodel/main.qml 4
-
- And finally a bar series that shows the share for all the other manufacturers between 2007-2011:
- \snippet ../demos/qmlcustommodel/qml/qmlcustommodel/main.qml 5
-*/
diff --git a/doc/src/demos.qdoc b/doc/src/demos.qdoc
index 453f4c95..38c310f4 100644
--- a/doc/src/demos.qdoc
+++ b/doc/src/demos.qdoc
@@ -41,11 +41,11 @@
</tr>
<tr>
<td><a href="demos-qmlcustomizations.html">Qml Customizations</a></td>
- <td><a href="demos-qmlcustommodel.html">Qml Custom Model</a></td>
+ <td><a href="demos-qmlcustomlegend.html">Qml Custom Legend</a></td>
</tr>
<tr>
<td><a href="demos-qmlcustomizations.html"><img src="images/demos_qmlcustomizations.png" width="300" alt="Qml Customizations" /></a></td>
- <td><a href="demos-qmlcustommodel.html"><img src="images/demos_qmlcustommodel.png" width="300" alt="Qml Custom Model" /></a></td>
+ <td><a href="demos-qmlcustomlegend.html"><img src="images/demos-qmlcustomlegend1.png" width="300" alt="Qml Custom Legend" /></a></td>
</tr>
<tr>
<td><a href="demos-qmlf1legends.html">Qml F1 Legends</a></td>
@@ -57,24 +57,18 @@
</tr>
<tr>
<td><a href="demos-qmlweather.html">Qml Weather</a></td>
- <td><a href="demos-qmlcustomlegend.html">Qml Custom Legend</a></td>
- </tr>
- <tr>
- <td><a href="demos-qmlweather.html"><img src="images/demos_qmlweather.png" width="300" alt="Qml Weather" /></a></td>
- <td><a href="demos-qmlcustomlegend.html"><img src="images/demos-qmlcustomlegend1.png" width="300" alt="Qml Custom Legend" /></a></td>
- </tr>
- <tr>
<td><a href="demos-qmlpolarchart.html">Qml Polar Chart</a></td>
- <td><a href="demos-quick2chart.html">Qt Quick 2 Basic Charts</a></td>
</tr>
<tr>
+ <td><a href="demos-qmlweather.html"><img src="images/demos_qmlweather.png" width="300" alt="Qml Weather" /></a></td>
<td><a href="demos-qmlpolarchart.html"><img src="images/demos_qmlpolarchart1.png" width="300" alt="Qml Polar Chart" /></a></td>
- <td><a href="demos-quick2chart.html"><img src="images/demos_qmlchart1.png" width="300" alt="Qt Quick 2 Basic Charts" /></a></td>
</tr>
<tr>
+ <td><a href="demos-quick2chart.html">Qt Quick 2 Basic Charts</a></td>
<td><a href="demos-quick2oscilloscope.html">Qt Quick 2 Oscilloscope</a></td>
</tr>
<tr>
+ <td><a href="demos-quick2chart.html"><img src="images/demos_qmlchart1.png" width="300" alt="Qt Quick 2 Basic Charts" /></a></td>
<td><a href="demos-quick2oscilloscope.html"><img src="images/demos_qmloscilloscope.png" width="300" alt="Qt Quick 2 Oscilloscope" /></a></td>
</tr>
</table>