HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1857:58a3a87ea08b

QML API versioning to QtCommercial.Chart 1.1

Tero Ahola -

r1857:58a3a87ea08b

parent child

Context file:

r1857:58a3a87ea08b

Expand all files

demos/qmlchart/qml/qmlchart/View1.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent

demos/qmlchart/qml/qmlchart/View10.qml +2 -2

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                     legend.alignment: Qt.AlignBottom
                     HorizontalStackedBarSeries {
-                        axisY: BarCategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
+                        axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                         BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
                         BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                         BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }

demos/qmlchart/qml/qmlchart/View11.qml +2 -2

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                     legend.alignment: Qt.AlignBottom
                     HorizontalPercentBarSeries {
-                        axisY: BarCategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
+                        axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                         BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
                         BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                         BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }

demos/qmlchart/qml/qmlchart/View12.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent

demos/qmlchart/qml/qmlchart/View2.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent

demos/qmlchart/qml/qmlchart/View3.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent

demos/qmlchart/qml/qmlchart/View4.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent

demos/qmlchart/qml/qmlchart/View5.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent

demos/qmlchart/qml/qmlchart/View6.qml +2 -2

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                     BarSeries {
                         id: mySeries
-                        axisX: BarCategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
+                        axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                         BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
                         BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                         BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }

demos/qmlchart/qml/qmlchart/View7.qml +2 -2

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                     StackedBarSeries {
                         id: mySeries
-                        axisX: BarCategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
+                        axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                         BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
                         BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                         BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }

demos/qmlchart/qml/qmlchart/View8.qml +2 -2

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                     legend.alignment: Qt.AlignBottom
                     PercentBarSeries {
-                        axisX: BarCategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
+                        axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                         BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
                         BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                         BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }

demos/qmlchart/qml/qmlchart/View9.qml +2 -2

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                     legend.alignment: Qt.AlignBottom
                     HorizontalBarSeries {
-                        axisY: BarCategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
+                        axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                         BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
                         BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                         BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }

demos/qmlcustommodel/qml/qmlcustommodel/main.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             import QmlCustomModel 1.0
             Rectangle {

demos/qmlf1legends/qml/qmlf1legends/main.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.1
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 width: 360

demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             //![1]
             ChartView {

demos/qmlweather/qml/qmlweather/main.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.1
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 width: 360

examples/qmlpiechart/qml/qmlpiechart/main.qml +1 -1

             //![1]
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 width: 400

plugins/declarative/declarativeareaseries.h +4 -4

                 Q_OBJECT
                 Q_PROPERTY(DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries)
                 Q_PROPERTY(DeclarativeLineSeries *lowerSeries READ lowerSeries WRITE setLowerSeries)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
             public:
                 explicit DeclarativeAreaSeries(QObject *parent = 0);
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
             Q_SIGNALS:
-                void axisXChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
-                void axisYChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             private:
                 QAbstractAxis *m_axisX;

plugins/declarative/declarativebarseries.h +24 -24

             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
                 void componentComplete();
             Q_SIGNALS:
-                void axisXChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
-                void axisYChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
                 void componentComplete();
             Q_SIGNALS:
-                void axisXChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
-                void axisYChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
                 void componentComplete();
             Q_SIGNALS:
-                void axisXChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
-                void axisYChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
                 void componentComplete();
             Q_SIGNALS:
-                void axisXChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
-                void axisYChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
                 void componentComplete();
             Q_SIGNALS:
-                void axisXChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
-                void axisYChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
                 void componentComplete();
             Q_SIGNALS:
-                void axisXChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
-                void axisYChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);

plugins/declarative/declarativelineseries.h +4 -4

                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
             Q_SIGNALS:
                 void countChanged(int count);
-                void axisXChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
-                void axisYChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);

plugins/declarative/declarativescatterseries.h +4 -4

                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
             Q_SIGNALS:
                 void countChanged(int count);
-                void axisXChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
-                void axisYChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);

plugins/declarative/declarativesplineseries.h +4 -4

                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
-                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+                Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
-                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+                Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
             Q_SIGNALS:
                 void countChanged(int count);
-                void axisXChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
-                void axisYChanged(QAbstractAxis *axis);
+                Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
             public Q_SLOTS:
                 static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);

plugins/declarative/plugin.cpp +45 -5

@@ -50,6 +50,7 public:
50	{	50	{
51	Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));	51	Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
52		52
		53	// QtCommercial.Chart 1.0
53	qmlRegisterType<DeclarativeChart>(uri, 1, 0, "ChartView");	54	qmlRegisterType<DeclarativeChart>(uri, 1, 0, "ChartView");
54	qmlRegisterType<DeclarativeXYPoint>(uri, 1, 0, "XYPoint");	55	qmlRegisterType<DeclarativeXYPoint>(uri, 1, 0, "XYPoint");
55	qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");	56	qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
@@ -59,9 +60,6 public:
59	qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");	60	qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");
60	qmlRegisterType<DeclarativeStackedBarSeries>(uri, 1, 0, "StackedBarSeries");	61	qmlRegisterType<DeclarativeStackedBarSeries>(uri, 1, 0, "StackedBarSeries");
61	qmlRegisterType<DeclarativePercentBarSeries>(uri, 1, 0, "PercentBarSeries");	62	qmlRegisterType<DeclarativePercentBarSeries>(uri, 1, 0, "PercentBarSeries");
62	qmlRegisterType<DeclarativeHorizontalBarSeries>(uri, 1, 0, "HorizontalBarSeries");
63	qmlRegisterType<DeclarativeHorizontalStackedBarSeries>(uri, 1, 0, "HorizontalStackedBarSeries");
64	qmlRegisterType<DeclarativeHorizontalPercentBarSeries>(uri, 1, 0, "HorizontalPercentBarSeries");
65	qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");	63	qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
66	qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice");	64	qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice");
67	qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");	65	qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
@@ -71,9 +69,8 public:
71	qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");	69	qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
72	qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");	70	qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
73	qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");	71	qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
74	qmlRegisterType<QValueAxis>(uri, 1, 0, "ValueAxis");	72	qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis");
75	qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis");	73	qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis");
76
77	qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",	74	qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
78	QLatin1String("Trying to create uncreatable: Legend."));	75	QLatin1String("Trying to create uncreatable: Legend."));
79	qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries",	76	qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries",
@@ -92,6 +89,49 public:
92	QLatin1String("Trying to create uncreatable: AbstractBarSeries."));	89	QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
93	qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",	90	qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
94	QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));	91	QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
		92
		93	// QtCommercial.Chart 1.1
		94	qmlRegisterType<DeclarativeChart>(uri, 1, 1, "ChartView");
		95	qmlRegisterType<DeclarativeXYPoint>(uri, 1, 1, "XYPoint");
		96	qmlRegisterType<DeclarativeScatterSeries, 1>(uri, 1, 1, "ScatterSeries");
		97	qmlRegisterType<DeclarativeLineSeries, 1>(uri, 1, 1, "LineSeries");
		98	qmlRegisterType<DeclarativeSplineSeries, 1>(uri, 1, 1, "SplineSeries");
		99	qmlRegisterType<DeclarativeAreaSeries, 1>(uri, 1, 1, "AreaSeries");
		100	qmlRegisterType<DeclarativeBarSeries, 1>(uri, 1, 1, "BarSeries");
		101	qmlRegisterType<DeclarativeStackedBarSeries, 1>(uri, 1, 1, "StackedBarSeries");
		102	qmlRegisterType<DeclarativePercentBarSeries, 1>(uri, 1, 1, "PercentBarSeries");
		103	qmlRegisterType<DeclarativeHorizontalBarSeries, 1>(uri, 1, 1, "HorizontalBarSeries");
		104	qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 1>(uri, 1, 1, "HorizontalStackedBarSeries");
		105	qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 1>(uri, 1, 1, "HorizontalPercentBarSeries");
		106	qmlRegisterType<DeclarativePieSeries>(uri, 1, 1, "PieSeries");
		107	qmlRegisterType<QPieSlice>(uri, 1, 1, "PieSlice");
		108	qmlRegisterType<DeclarativeBarSet>(uri, 1, 1, "BarSet");
		109	qmlRegisterType<QHXYModelMapper>(uri, 1, 1, "HXYModelMapper");
		110	qmlRegisterType<QVXYModelMapper>(uri, 1, 1, "VXYModelMapper");
		111	qmlRegisterType<QHPieModelMapper>(uri, 1, 1, "HPieModelMapper");
		112	qmlRegisterType<QVPieModelMapper>(uri, 1, 1, "VPieModelMapper");
		113	qmlRegisterType<QHBarModelMapper>(uri, 1, 1, "HBarModelMapper");
		114	qmlRegisterType<QVBarModelMapper>(uri, 1, 1, "VBarModelMapper");
		115	qmlRegisterType<QValueAxis>(uri, 1, 1, "ValueAxis");
		116	qmlRegisterType<QBarCategoryAxis>(uri, 1, 1, "BarCategoryAxis");
		117	qmlRegisterUncreatableType<QLegend>(uri, 1, 1, "Legend",
		118	QLatin1String("Trying to create uncreatable: Legend."));
		119	qmlRegisterUncreatableType<QXYSeries>(uri, 1, 1, "XYSeries",
		120	QLatin1String("Trying to create uncreatable: XYSeries."));
		121	qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 1, "AbstractItemModel",
		122	QLatin1String("Trying to create uncreatable: AbstractItemModel."));
		123	qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 1, "XYModelMapper",
		124	QLatin1String("Trying to create uncreatable: XYModelMapper."));
		125	qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 1, "PieModelMapper",
		126	QLatin1String("Trying to create uncreatable: PieModelMapper."));
		127	qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 1, "BarModelMapper",
		128	QLatin1String("Trying to create uncreatable: BarModelMapper."));
		129	qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 1, "AbstractSeries",
		130	QLatin1String("Trying to create uncreatable: AbstractSeries."));
		131	qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 1, "AbstractBarSeries",
		132	QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
		133	qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 1, "AbstractAxis",
		134	QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
95	}	135	}
96	};	136	};
97		137

tests/qmlchartaxis/qml/qmlchartaxis/Chart0.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView

tests/qmlchartaxis/qml/qmlchartaxis/Chart1.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "user defined axes"

tests/qmlchartaxis/qml/qmlchartaxis/Chart2.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView

tests/qmlchartaxis/qml/qmlchartaxis/Chart3.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "configuring dynamically"

tests/qmlchartaxis/qml/qmlchartaxis/Chart4.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "series specific dynamic axes"

tests/qmlchartaxis/qml/qmlchartaxis/Chart5.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView

tests/qmlchartaxis/qml/qmlchartaxis/Chart6.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView

tests/qmlchartaxis/qml/qmlchartaxis/Chart7.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView

tests/qmlchartaxis/qml/qmlchartaxis/Chart8.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView

tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "area series"

tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml +2 -2

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "Bar series"
                 BarSeries {
                     id: mySeries
                     name: "bar"
-                    axisX: BarCategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
+                    axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                         onHovered:                  console.log("barset.onHovered: " + status);

tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView

tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 property variant series: lineSeries

tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml +2 -2

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "Percent bar series"
                 PercentBarSeries {
                     id: mySeries
                     name: "bar"
-                    axisX: BarCategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
+                    axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);

tests/qmlchartproperties/qml/qmlchartproperties/PieChart.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chart

tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "scatter series"

tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml +1 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "spline series"

tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml +2 -2

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "Stacked bar series"
                 StackedBarSeries {
                     id: mySeries
                     name: "bar"
-                    axisX: BarCategoriesAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
+                    axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                         onHovered:                  console.log("barset.onHovered: " + status);

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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