HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2618:7768c3fc60b8

doc/src/demos.qdoc +5 -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>
                     </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>

src/barchart/qhbarmodelmapper.cpp +3 -3

             */
             /*!
                 \qmlproperty SomeModel HBarModelMapper::model
-                The QAbstractItemModel based model that is used by the mapper. You need to implement the model and expose it to
+                The QAbstractItemModel based model that is used by the mapper. You need to implement the model
-                QML as shown in \l {QML Custom Model} demo application. Note: the model has to support adding/removing rows/columns
+                and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying
-                and modifying the data of the cells.
+                the data of the cells.
             */
             /*!

src/barchart/qvbarmodelmapper.cpp +3 -3

             */
             /*!
                 \qmlproperty SomeModel VBarModelMapper::model
-                The QAbstractItemModel based model that is used by the mapper. You need to implement the model and expose it to
+                The QAbstractItemModel based model that is used by the mapper. You need to implement the model
-                QML as shown in \l {QML Custom Model} demo application. Note: the model has to support adding/removing rows/columns
+                and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying
-                and modifying the data of the cells.
+                the data of the cells.
             */
             /*!

src/piechart/qhpiemodelmapper.cpp +3 -3

             */
             /*!
                 \qmlproperty SomeModel HPieModelMapper::model
-                The QAbstractItemModel based model that is used by the mapper. You need to implement the model and expose it to
+                The QAbstractItemModel based model that is used by the mapper. You need to implement the model
-                QML as shown in \l {QML Custom Model} demo application. Note: the model has to support adding/removing rows/columns
+                and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying
-                and modifying the data of the cells.
+                the data of the cells.
             */
             /*!

src/piechart/qvpiemodelmapper.cpp +3 -3

             */
             /*!
                 \qmlproperty SomeModel VPieModelMapper::model
-                The QAbstractItemModel based model that is used by the mapper. You need to implement the model and expose it to
+                The QAbstractItemModel based model that is used by the mapper. You need to implement the model
-                QML as shown in \l {QML Custom Model} demo application. Note: the model has to support adding/removing rows/columns
+                and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying
-                and modifying the data of the cells.
+                the data of the cells.
             */
             /*!

src/xychart/qhxymodelmapper.cpp +3 -3

             */
             /*!
                 \qmlproperty SomeModel HXYModelMapper::model
-                The QAbstractItemModel based model that is used by the mapper. You need to implement the model and expose it to
+                The QAbstractItemModel based model that is used by the mapper. You need to implement the model
-                QML as shown in \l {QML Custom Model} demo application. Note: the model has to support adding/removing rows/columns
+                and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying
-                and modifying the data of the cells.
+                the data of the cells.
             */
             /*!

src/xychart/qvxymodelmapper.cpp +3 -3

             */
             /*!
                 \qmlproperty SomeModel VXYModelMapper::model
-                The QAbstractItemModel based model that is used by the mapper. You need to implement the model and expose it to
+                The QAbstractItemModel based model that is used by the mapper. You need to implement the model
-                QML as shown in \l {QML Custom Model} demo application. Note: the model has to support adding/removing rows/columns
+                and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying
-                and modifying the data of the cells.
+                the data of the cells.
             */
             /*!

demos/qmlcustommodel/customtablemodel.cpp removed 0 -136

NO CONTENT: file was removed

demos/qmlcustommodel/customtablemodel.h removed 0 -56

NO CONTENT: file was removed

demos/qmlcustommodel/declarativemodel.cpp removed 0 -110

NO CONTENT: file was removed

demos/qmlcustommodel/declarativemodel.h removed 0 -66

NO CONTENT: file was removed

demos/qmlcustommodel/main.cpp removed 0 -55

NO CONTENT: file was removed

demos/qmlcustommodel/qml/qmlcustommodel/loader.qml removed 0 -37

NO CONTENT: file was removed

demos/qmlcustommodel/qml/qmlcustommodel/main.qml removed 0 -183

NO CONTENT: file was removed

demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp removed 0 -177

NO CONTENT: file was removed

demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.h removed 0 -46

NO CONTENT: file was removed

demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri removed 0 -13

NO CONTENT: file was removed

demos/qmlcustommodel/qmlchart.svg removed 0 -93

NO CONTENT: file was removed

demos/qmlcustommodel/qmlcustommodel.pro removed 0 -13

NO CONTENT: file was removed

demos/qmlcustommodel/resources.qrc removed 0 -6

NO CONTENT: file was removed

doc/src/demos-qmlcustommodel.qdoc removed 0 -29

NO CONTENT: file was removed

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages