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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                 property variant othersSlice: 0
                 //![1]
                 ChartView {
                     id: chart
                     title: "Top-5 car brand shares in Finland"
                     anchors.fill: parent
                     legend.alignment: Qt.AlignBottom
                     PieSeries {
                         id: pieSeries
                         PieSlice { label: "Volkswagen"; value: 13.5 }
                         PieSlice { label: "Toyota"; value: 10.9 }
                         PieSlice { label: "Ford"; value: 8.6 }
                         PieSlice { label: "Skoda"; value: 8.2 }
                         PieSlice { label: "Volvo"; value: 6.8 }
                     }
                 }
                 Component.onCompleted: {
                     // You can also manipulate slices dynamically
                     othersSlice = pieSeries.append("Others", 52.0);
                     pieSeries.find("Volkswagen").exploded = true;
                 }
                 //![1]
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Horizontal Stacked Bar series"
                     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] }
                     }
                 }
                 //![1]
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Horizontal Percent Bar series"
                     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] }
                     }
                 }
                 //![1]
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     id: chart
                     title: "Production costs"
                     anchors.fill: parent
                     legend.visible: false
                     PieSeries {
                         id: pieOuter
                         size: 0.96
                         holeSize: 0.7
                         PieSlice { id: slice; label: "Alpha"; value: 19511; color: "#8AB846"; borderColor: "#163430" }
                         PieSlice { label: "Epsilon"; value: 11105; color: "#C0EEFF"; borderColor: "#3B391C" }
                         PieSlice { label: "Psi"; value: 9352; color: "#DF8939"; borderColor: "#13060C" }
                     }
                     PieSeries {
                         size: 0.7
                         id: pieInner
                         holeSize: 0.25
                         PieSlice { label: "Materials"; value: 10334; color: "#8AB846"; borderColor: "#163430" }
                         PieSlice { label: "Employee"; value: 3066; color: "#AAE356"; borderColor: "#163430" }
                         PieSlice { label: "Logistics"; value: 6111; color: "#99CC4E"; borderColor: "#163430" }
                         PieSlice { label: "Materials"; value: 7371; color: "#C0EEFF"; borderColor: "#3B391C" }
                         PieSlice { label: "Employee"; value: 2443; color: "#C9FAFF"; borderColor: "#3B391C" }
                         PieSlice { label: "Logistics"; value: 1291; color: "#B0FAFF"; borderColor: "#3B391C" }
                         PieSlice { label: "Materials"; value: 4022; color: "#DF8939"; borderColor: "#13060C" }
                         PieSlice { label: "Employee"; value: 3998; color: "#FC9D42"; borderColor: "#13060C" }
                         PieSlice { label: "Logistics"; value: 1332; color: "#F2963F"; borderColor: "#13060C" }
                     }
                 }
                 Component.onCompleted: {
                     // Set the common slice properties dynamically for convenience
                     for (var i = 0; i < pieOuter.count; i++) {
                         pieOuter.at(i).labelPosition = PieSlice.LabelOutside;
                         pieOuter.at(i).labelVisible = true;
                         pieOuter.at(i).borderWidth = 3;
                     }
                     for (var i = 0; i < pieInner.count; i++) {
                         pieInner.at(i).labelPosition = PieSlice.LabelInsideNormal;
                         pieInner.at(i).labelVisible = true;
                         pieInner.at(i).borderWidth = 2;
                     }
                 }
                 //![1]
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Line"
                     anchors.fill: parent
                     LineSeries {
                         name: "LineSeries"
                         XYPoint { x: 0; y: 0 }
                         XYPoint { x: 1.1; y: 2.1 }
                         XYPoint { x: 1.9; y: 3.3 }
                         XYPoint { x: 2.1; y: 2.1 }
                         XYPoint { x: 2.9; y: 4.9 }
                         XYPoint { x: 3.4; y: 3.0 }
                         XYPoint { x: 4.1; y: 3.3 }
                     }
                 }
                 //![1]
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Spline"
                     anchors.fill: parent
                     SplineSeries {
                         name: "SplineSeries"
                         XYPoint { x: 0; y: 0.0 }
                         XYPoint { x: 1.1; y: 3.2 }
                         XYPoint { x: 1.9; y: 2.4 }
                         XYPoint { x: 2.1; y: 2.1 }
                         XYPoint { x: 2.9; y: 2.6 }
                         XYPoint { x: 3.4; y: 2.3 }
                         XYPoint { x: 4.1; y: 3.1 }
                     }
                 }
                 //![1]
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "NHL All-Star Team Players"
                     anchors.fill: parent
                     BarCategoriesAxis {
                         id: catergoriesAxis
                         categories: ["2000", "2001", "2002", "2003", "2004", "2005", "2006", "2007", "2008",
                             "2009", "2010", "2011" ]
                     }
                     AreaSeries {
                         name: "Russian"
                         axisX: catergoriesAxis
                         upperSeries: LineSeries {
                             XYPoint { x: 0; y: 1 }
                             XYPoint { x: 1; y: 1 }
                             XYPoint { x: 2; y: 1 }
                             XYPoint { x: 3; y: 1 }
                             XYPoint { x: 4; y: 1 }
                             XYPoint { x: 5; y: 0 }
                             XYPoint { x: 6; y: 1 }
                             XYPoint { x: 7; y: 1 }
                             XYPoint { x: 8; y: 4 }
                             XYPoint { x: 9; y: 3 }
                             XYPoint { x: 10; y: 2 }
                             XYPoint { x: 11; y: 1 }
                         }
                     }
                     // ...
                     //![1]
                     AreaSeries {
                         name: "Swedish"
                         axisX: catergoriesAxis
                         upperSeries: LineSeries {
                             XYPoint { x: 0; y: 1 }
                             XYPoint { x: 1; y: 1 }
                             XYPoint { x: 2; y: 3 }
                             XYPoint { x: 3; y: 3 }
                             XYPoint { x: 4; y: 2 }
                             XYPoint { x: 5; y: 0 }
                             XYPoint { x: 6; y: 2 }
                             XYPoint { x: 7; y: 1 }
                             XYPoint { x: 8; y: 2 }
                             XYPoint { x: 9; y: 1 }
                             XYPoint { x: 10; y: 3 }
                             XYPoint { x: 11; y: 3 }
                         }
                     }
                     AreaSeries {
                         name: "Finnish"
                         axisX: catergoriesAxis
                         upperSeries: LineSeries {
                             XYPoint { x: 0; y: 0 }
                             XYPoint { x: 1; y: 0 }
                             XYPoint { x: 2; y: 0 }
                             XYPoint { x: 3; y: 0 }
                             XYPoint { x: 4; y: 0 }
                             XYPoint { x: 5; y: 0 }
                             XYPoint { x: 6; y: 1 }
                             XYPoint { x: 7; y: 0 }
                             XYPoint { x: 8; y: 0 }
                             XYPoint { x: 9; y: 0 }
                             XYPoint { x: 10; y: 0 }
                             XYPoint { x: 11; y: 1 }
                         }
                         onClicked: {
                             color = "white";
                             borderColor = "blue";
                         }
                     }
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Scatters"
                     anchors.fill: parent
                     ScatterSeries {
                         id: scatter1
                         name: "Scatter1"
                         XYPoint { x: 1.5; y: 1.5 }
                         XYPoint { x: 1.5; y: 1.6 }
                         XYPoint { x: 1.57; y: 1.55 }
                         XYPoint { x: 1.8; y: 1.8 }
                         XYPoint { x: 1.9; y: 1.6 }
                         XYPoint { x: 2.1; y: 1.3 }
                         XYPoint { x: 2.5; y: 2.1 }
                     }
                     ScatterSeries {
                         name: "Scatter2"
                         // ...
                         //![1]
                         XYPoint { x: 2.0; y: 2.0 }
                         XYPoint { x: 2.0; y: 2.1 }
                         XYPoint { x: 2.07; y: 2.05 }
                         XYPoint { x: 2.2; y: 2.9 }
                         XYPoint { x: 2.4; y: 2.7 }
                         XYPoint { x: 2.67; y: 2.65 }
                     }
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Bar series"
                     anchors.fill: parent
                     legend.alignment: Qt.AlignBottom
                     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] }
                     }
                 }
                 //![1]
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Stacked Bar series"
                     anchors.fill: parent
                     legend.alignment: Qt.AlignBottom
                     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] }
                     }
                 }
                 //![1]
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Percent Bar series"
                     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] }
                     }
                 }
                 //![1]
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     title: "Horizontal Bar series"
                     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] }
                     }
                 }
                 //![1]
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             import QmlCustomModel 1.0
             Rectangle {
                 anchors.fill: parent
                 //![1]
                 ChartView {
                     id: chartView
                     title: "Top-5 car brand shares in Finland"
                     anchors.fill: parent
                     animationOptions: ChartView.SeriesAnimations
                     BarCategoriesAxis {
                         id: categoriesAxis
                         categories: ["2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014" ]
                         min: "2007"
                         max: "2014"
                     }
                     ValueAxis {
                         id: valueAxis
                         min: 0
                         max: 60
                     }
                     // ...
                     //![1]
                     //![2]
                     CustomModel {
                         id: customModel
                         verticalHeaders: ["Manufacturer", "Volkswagen", "Toyota", "Ford", "Skoda", "Volvo", "Others"]
                         CustomModelElement { values: [0, "Manufacturer", 0, 1, 2, 3, 4] }
                         CustomModelElement { values: [1, "Volkswagen", 10.3, 12.0, 12.8, 13.0, 13.8] }
                         CustomModelElement { values: [2, "Toyota", 13.8, 13.5, 16.2, 13.7, 10.7] }
                         CustomModelElement { values: [3, "Ford", 6.4, 7.1, 8.9, 8.2, 8.6] }
                         CustomModelElement { values: [4, "Skoda", 4.7, 5.8, 6.9, 8.3, 8.2] }
                         CustomModelElement { values: [5, "Volvo", 7.1, 6.7, 6.5, 6.3, 7.0] }
                         CustomModelElement { values: [6, "Others", 57.7, 54.9, 48.7, 50.5, 51.7] }
                     }
                     //![2]
                     //![5]
                     BarSeries {
                         id: myBarSeries
                         name: "Others"
                         axisX: categoriesAxis
                         axisY: valueAxis
                         barWidth: 0.9
                         visible: false
                         HBarModelMapper {
                             model: customModel
                             firstBarSetRow: 6
                             lastBarSetRow: 6
                             firstColumn: 2
                         }
                     }
                     //![5]
                     //![4]
                     LineSeries {
                         id: lineSeries1
                         name: "Volkswagen"
                         axisX: categoriesAxis
                         axisY: valueAxis
                         visible: false
                         HXYModelMapper {
                             model: customModel
                             xRow: 0
                             yRow: 1
                             firstColumn: 2
                         }
                     }
                     //![4]
                     LineSeries {
                         id: lineSeries2
                         name: "Toyota"
                         axisX: categoriesAxis
                         axisY: valueAxis
                         visible: false
                         HXYModelMapper {
                             model: customModel
                             xRow: 0
                             yRow: 2
                             firstColumn: 2
                         }
                     }
                     LineSeries {
                         id: lineSeries3
                         name: "Ford"
                         axisX: categoriesAxis
                         axisY: valueAxis
                         visible: false
                         HXYModelMapper {
                             model: customModel
                             xRow: 0
                             yRow: 3
                             firstColumn: 2
                         }
                     }
                     LineSeries {
                         id: lineSeries4
                         name: "Skoda"
                         axisX: categoriesAxis
                         axisY: valueAxis
                         visible: false
                         HXYModelMapper {
                             model: customModel
                             xRow: 0
                             yRow: 4
                             firstColumn: 2
                         }
                     }
                     LineSeries {
                         id: lineSeries5
                         name: "Volvo"
                         axisX: categoriesAxis
                         axisY: valueAxis
                         visible: false
                         HXYModelMapper {
                             model: customModel
                             xRow: 0
                             yRow: 5
                             firstColumn: 2
                         }
                     }
                     //![3]
                     PieSeries {
                         id: pieSeries
                         size: 0.4
                         horizontalPosition: 0.85
                         verticalPosition: 0.4
                         onClicked: {
                             // Show the selection by exploding the slice
                             slice.exploded = !slice.exploded;
                             // Update the line series to show the yearly data for this slice
                             for (var i = 0; i < chartView.count; i++) {
                                 if (chartView.series(i).name == slice.label) {
                                     chartView.series(i).visible = slice.exploded;
                                 }
                             }
                         }
                         VPieModelMapper {
                             model: customModel
                             labelsColumn: 1
                             valuesColumn: 2
                             firstRow: 1
                         }
                     }
                     //![3]
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.1
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 width: 360
                 height: 360
                 property int currentIndex: -1
                 //![1]
                 ChartView {
                     id: chartView
                     title: "Driver Speeds, lap 1"
                     anchors.fill: parent
                     legend.alignment: Qt.AlignTop
                     animationOptions: ChartView.SeriesAnimations
                 }
                 //![1]
                 //![2]
                 // An example XmlListModel containing F1 legend drivers' speeds at speed traps
                 SpeedsXml {
                     id: speedsXml
                     onStatusChanged: {
                         if (status == XmlListModel.Ready) {
                             timer.start();
                         }
                     }
                 }
                 //![2]
                 //![3]
                 // A timer to mimic refreshing the data dynamically
                 Timer {
                     id: timer
                     interval: 700
                     repeat: true
                     triggeredOnStart: true
                     running: false
                     onTriggered: {
                         currentIndex++;
                         if (currentIndex < speedsXml.count) {
                             // Check if there is a series for the data already (we are using driver name to identify series)
                             var lineSeries = chartView.series(speedsXml.get(currentIndex).driver);
                             if (!lineSeries) {
                                 lineSeries = chartView.createSeries(ChartView.SeriesTypeLine, speedsXml.get(currentIndex).driver);
                                 chartView.axisY().min = 0;
                                 chartView.axisY().max = 250
                             }
                             lineSeries.append(currentIndex, speedsXml.get(currentIndex).speed);
                             // Make the x-axis range dynamic
                             if (currentIndex > 9)
                                 chartView.axisX().min = currentIndex - 10;
                             else
                                 chartView.axisX().min = 0;
                             chartView.axisX().max = currentIndex + 1;
                         } else {
                             // No more data, change x-axis range to show all the data
                             timer.stop();
                             chartView.animationOptions = ChartView.AllAnimations;
                             chartView.axisX().min = 0;
                             chartView.axisX().max = currentIndex + 1;
                         }
                     }
                 }
                 //![3]
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             //![1]
             ChartView {
                 id: chartView
                 animationOptions: ChartView.NoAnimation
                 ValueAxis {
                     id: axisY1
                     min: -1
                     max: 4
                 }
                 ValueAxis {
                     id: axisY2
                     min: -10
                     max: 5
                 }
                 ValueAxis {
                     id: axisX
                     min: 0
                     max: 1000
                 }
                 LineSeries {
                     id: lineSeries1
                     name: "signal 1"
                     axisX: axisX
                     axisY: axisY1
                 }
                 LineSeries {
                     id: lineSeries2
                     name: "signal 2"
                     axisX: axisX
                     axisY: axisY2
                 }
             // ...
             //![1]
                 //![2]
                 Timer {
                     id: refreshTimer
                     interval: 1 / 60 * 1000 // 60 Hz
                     running: true
                     repeat: true
                     onTriggered: {
                         dataSource.update(chartView.series(0));
                         dataSource.update(chartView.series(1));
                     }
                 }
                 //![2]
                 function changeSeriesType(type) {
                     chartView.series(1).destroy();
                     chartView.series(0).destroy();
                     var seriesCount = 2;
                     for (var i = 0; i < seriesCount; i++) {
                         var series;
                         if (type == "line") {
                             series = scopeView.createSeries(ChartView.SeriesTypeLine, "signal " + (i + 1));
                         } else if (type == "spline") {
                             series = chartView.createSeries(ChartView.SeriesTypeSpline, "signal " + (i + 1));
                         } else {
                             series = chartView.createSeries(ChartView.SeriesTypeScatter, "signal " + (i + 1));
                             series.markerSize = 3;
                             series.borderColor = "transparent";
                         }
                     }
                 }
                 function setAnimations(enabled) {
                     if (enabled)
                         scopeView.animationOptions = ChartView.SeriesAnimations;
                     else
                         scopeView.animationOptions = ChartView.NoAnimation;
                 }
                 function changeRefreshRate(rate) {
                     refreshTimer.interval = 1 / Number(rate) * 1000;
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.1
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             Rectangle {
                 width: 360
                 height: 360
                 //![1]
                 ChartView {
                     id: chartView
                     title: "Weather forecast"
                 //![1]
                     anchors.top: parent.top
                     anchors.bottom: weatherImageRow.top
                     anchors.left: parent.left
                     anchors.right: parent.right
                     legend.alignment: Qt.AlignTop
                 //![2]
                     BarCategoriesAxis {
                         id: barCategoriesAxis
                     }
                     BarSeries {
                         id: myBarSeries
                         axisX: barCategoriesAxis
                         axisY: valueAxisY
                         BarSet {
                             id: rainfallSet
                             label: "Rainfall"
                         }
                     }
                     ValueAxis {
                         id: valueAxisX
                         min: 0
                         max: 5
                     }
                     ValueAxis{
                         id: valueAxisY
                         min: 0
                         max: 10
                     }
                     LineSeries {
                         id: maxTempSeries
                         axisX: valueAxisX
                         axisY: valueAxisY
                         name: "Max. temperature"
                     }
                     LineSeries {
                         id: minTempSeries
                         axisX: valueAxisX
                         axisY: valueAxisY
                         name: "Min. temperature"
                     }
                 //![2]
                 }
                 // A timer to refresh the forecast every 5 minutes
                 Timer {
                     interval: 300000
                     repeat: true
                     triggeredOnStart: true
                     running: true
                     onTriggered: {
                         if (weatherAppKey != "") {
                             //![3]
                             // Make HTTP GET request and parse the result
                             var xhr = new XMLHttpRequest;
                             xhr.open("GET",
                                      "http://free.worldweatheronline.com/feed/weather.ashx?q=Jyv%c3%a4skyl%c3%a4,Finland&format=json&num_of_days=5&key="
                                      + weatherAppKey);
                             xhr.onreadystatechange = function() {
                                 if (xhr.readyState == XMLHttpRequest.DONE) {
                                     var a = JSON.parse(xhr.responseText);
                                     parseWeatherData(a);
                                 }
                             }
                             xhr.send();
                             //![3]
                         } else {
                             // No app key for worldweatheronline.com given by the user -> use dummy static data
                             var responseText = "{ \"data\": { \"current_condition\": [ {\"cloudcover\": \"10\", \"humidity\": \"61\", \"observation_time\": \"06:26 AM\", \"precipMM\": \"0.0\", \"pressure\": \"1022\", \"temp_C\": \"6\", \"temp_F\": \"43\", \"visibility\": \"10\", \"weatherCode\": \"113\",  \"weatherDesc\": [ {\"value\": \"Sunny\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0001_sunny.png\" } ], \"winddir16Point\": \"SE\", \"winddirDegree\": \"140\", \"windspeedKmph\": \"7\", \"windspeedMiles\": \"4\" } ],  \"request\": [ {\"query\": \"Jyvaskyla, Finland\", \"type\": \"City\" } ],  \"weather\": [ {\"date\": \"2012-05-09\", \"precipMM\": \"0.4\", \"tempMaxC\": \"14\", \"tempMaxF\": \"57\", \"tempMinC\": \"7\", \"tempMinF\": \"45\", \"weatherCode\": \"116\",  \"weatherDesc\": [ {\"value\": \"Partly Cloudy\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0002_sunny_intervals.png\" } ], \"winddir16Point\": \"S\", \"winddirDegree\": \"179\", \"winddirection\": \"S\", \"windspeedKmph\": \"20\", \"windspeedMiles\": \"12\" }, {\"date\": \"2012-05-10\", \"precipMM\": \"2.4\", \"tempMaxC\": \"13\", \"tempMaxF\": \"55\", \"tempMinC\": \"8\", \"tempMinF\": \"46\", \"weatherCode\": \"266\",  \"weatherDesc\": [ {\"value\": \"Light drizzle\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0017_cloudy_with_light_rain.png\" } ], \"winddir16Point\": \"SW\", \"winddirDegree\": \"219\", \"winddirection\": \"SW\", \"windspeedKmph\": \"21\", \"windspeedMiles\": \"13\" }, {\"date\": \"2012-05-11\", \"precipMM\": \"11.1\", \"tempMaxC\": \"15\", \"tempMaxF\": \"59\", \"tempMinC\": \"7\", \"tempMinF\": \"44\", \"weatherCode\": \"266\",  \"weatherDesc\": [ {\"value\": \"Light drizzle\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0017_cloudy_with_light_rain.png\" } ], \"winddir16Point\": \"SSW\", \"winddirDegree\": \"200\", \"winddirection\": \"SSW\", \"windspeedKmph\": \"20\", \"windspeedMiles\": \"12\" }, {\"date\": \"2012-05-12\", \"precipMM\": \"2.8\", \"tempMaxC\": \"7\", \"tempMaxF\": \"44\", \"tempMinC\": \"2\", \"tempMinF\": \"35\", \"weatherCode\": \"317\",  \"weatherDesc\": [ {\"value\": \"Light sleet\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0021_cloudy_with_sleet.png\" } ], \"winddir16Point\": \"NW\", \"winddirDegree\": \"311\", \"winddirection\": \"NW\", \"windspeedKmph\": \"24\", \"windspeedMiles\": \"15\" }, {\"date\": \"2012-05-13\", \"precipMM\": \"0.4\", \"tempMaxC\": \"6\", \"tempMaxF\": \"42\", \"tempMinC\": \"2\", \"tempMinF\": \"35\", \"weatherCode\": \"116\",  \"weatherDesc\": [ {\"value\": \"Partly Cloudy\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0002_sunny_intervals.png\" } ], \"winddir16Point\": \"WNW\", \"winddirDegree\": \"281\", \"winddirection\": \"WNW\", \"windspeedKmph\": \"21\", \"windspeedMiles\": \"13\" } ] }}";
                             var a = JSON.parse(responseText);
                             parseWeatherData(a);
                         }
                     }
                 }
                 Row {
                     id: weatherImageRow
                     anchors.bottom: poweredByText.top
                     anchors.bottomMargin: 10
                     anchors.left: parent.left
                     anchors.leftMargin: 25
                     anchors.right: parent.right
                     anchors.rightMargin: 25
                     ListModel {
                         id: weatherImageModel
                     }
                     Repeater {
                         id: repeater
                         model: weatherImageModel
                         delegate: Image {
                             source: imageSource
                             width: weatherImageRow.width / weatherImageModel.count
                             height: width
                             fillMode: Image.PreserveAspectCrop
                         }
                     }
                 }
                 Text {
                     id: poweredByText
                     anchors.bottom: parent.bottom
                     anchors.bottomMargin: 10
                     anchors.left: parent.left
                     anchors.leftMargin: 25
                     text: "Powered by World Weather Online"
                 }
                 function parseWeatherData(weatherData) {
                     // Clear previous values
                     maxTempSeries.clear();
                     minTempSeries.clear();
                     weatherImageModel.clear();
                     //![4]
                     // Loop through the parsed JSON
                     for (var i in weatherData.data.weather) {
                         var weatherObj = weatherData.data.weather[i];
                         //![4]
                         //![5]
                         // Store temperature values, rainfall and weather icon
                         maxTempSeries.append(Number(i) + 0.5, weatherObj.tempMaxC);
                         minTempSeries.append(Number(i) + 0.5, weatherObj.tempMinC);
                         rainfallSet.append(i, weatherObj.precipMM);
                         weatherImageModel.append({"imageSource":weatherObj.weatherIconUrl[0].value});
                         //![5]
                         // Update scale of the chart
                         valueAxisY.max = Math.max(chartView.axisY().max,weatherObj.tempMaxC);
                         valueAxisX.min = 0;
                         valueAxisX.max = Number(i) + 1;
                         // Set the x-axis labels to the dates of the forecast
                         var xLabels = barCategoriesAxis.categories;
                         xLabels[Number(i)] = weatherObj.date.substring(5, 10);
                         barCategoriesAxis.categories = xLabels;
                         barCategoriesAxis.visible = true;
                         barCategoriesAxis.min = 0;
                         barCategoriesAxis.max = xLabels.length - 1;
                     }
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //![1]
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 width: 400
                 height: 300
                 theme: ChartView.ChartThemeBrownSand
             //![1]
             //![2]
                 PieSeries {
                     id: pieSeries
                     PieSlice { label: "eaten"; value: 94.9 }
                     PieSlice { label: "not yet eaten"; value: 5.1 }
                 }
             //![2]
                 Component.onCompleted: {
                     if (false) {
                         //![4]
                         pieSeries.append("don't care", 1.1);
                         //![4]
                         //![5]
                         pieSeries.at(0).exploded = true;
                         //![5]
                     }
                 }
             //![3]
             }
             //![3]

plugins/declarative/declarativeareaseries.h +4 -4

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVEAREASERIES_H
             #define DECLARATIVEAREASERIES_H
             #include "qareaseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeLineSeries;
             class DeclarativeAreaSeries : public QAreaSeries
             {
                 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 setUpperSeries(DeclarativeLineSeries* series);
                 DeclarativeLineSeries* upperSeries() const;
                 void setLowerSeries(DeclarativeLineSeries* series);
                 DeclarativeLineSeries* lowerSeries() const;
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 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;
                 QAbstractAxis *m_axisY;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEAREASERIES_H

plugins/declarative/declarativebarseries.h +24 -24

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVEBARSERIES_H
             #define DECLARATIVEBARSERIES_H
             #include "qbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qhorizontalbarseries.h"
             #include "qhorizontalstackedbarseries.h"
             #include "qhorizontalpercentbarseries.h"
             #include "qbarset.h"
             #include <QDeclarativeItem>
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class DeclarativeBarSet : public QBarSet
             {
                 Q_OBJECT
                 Q_PROPERTY(QVariantList values READ values WRITE setValues)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
             public:
                 explicit DeclarativeBarSet(QObject *parent = 0);
                 QVariantList values();
                 void setValues(QVariantList values);
             public: // From QBarSet
                 Q_INVOKABLE void append(qreal value) { QBarSet::append(value); }
                 Q_INVOKABLE void remove(const int index, const int count = 1) { QBarSet::remove(index, count); }
                 Q_INVOKABLE void replace(int index, qreal value) { QBarSet::replace(index, value); }
                 Q_INVOKABLE qreal at(int index) { return QBarSet::at(index); }
             Q_SIGNALS:
                 void countChanged(int count);
             private Q_SLOTS:
                 void handleCountChanged(int index, int count);
             };
             class DeclarativeBarSeries : public QBarSeries, public QDeclarativeParserStatus
             {
                 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")
             public:
                 explicit DeclarativeBarSeries(QDeclarativeItem *parent = 0);
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> seriesChildren();
             public:
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 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);
             private:
                 QAbstractAxis* m_axisX;
                 QAbstractAxis* m_axisY;
             };
             class DeclarativeStackedBarSeries : public QStackedBarSeries, public QDeclarativeParserStatus
             {
                 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")
             public:
                 explicit DeclarativeStackedBarSeries(QDeclarativeItem *parent = 0);
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> seriesChildren();
             public:
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QStackedBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QStackedBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 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);
             private:
                 QAbstractAxis* m_axisX;
                 QAbstractAxis* m_axisY;
             };
             class DeclarativePercentBarSeries : public QPercentBarSeries, public QDeclarativeParserStatus
             {
                 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")
             public:
                 explicit DeclarativePercentBarSeries(QDeclarativeItem *parent = 0);
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> seriesChildren();
             public:
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QPercentBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QPercentBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 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);
             private:
                 QAbstractAxis* m_axisX;
                 QAbstractAxis* m_axisY;
             };
             class DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QDeclarativeParserStatus
             {
                 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")
             public:
                 explicit DeclarativeHorizontalBarSeries(QDeclarativeItem *parent = 0);
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> seriesChildren();
             public:
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QHorizontalBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QHorizontalBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 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);
             private:
                 QAbstractAxis* m_axisX;
                 QAbstractAxis* m_axisY;
             };
             class DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QDeclarativeParserStatus
             {
                 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")
             public:
                 explicit DeclarativeHorizontalStackedBarSeries(QDeclarativeItem *parent = 0);
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> seriesChildren();
             public:
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QHorizontalStackedBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QHorizontalStackedBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 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);
             private:
                 QAbstractAxis* m_axisX;
                 QAbstractAxis* m_axisY;
             };
             class DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QDeclarativeParserStatus
             {
                 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")
             public:
                 explicit DeclarativeHorizontalPercentBarSeries(QDeclarativeItem *parent = 0);
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> seriesChildren();
             public:
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
                 Q_INVOKABLE bool remove(QBarSet *barset) { return QHorizontalPercentBarSeries::remove(barset); }
                 Q_INVOKABLE void clear() { return QHorizontalPercentBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 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);
             private:
                 QAbstractAxis* m_axisX;
                 QAbstractAxis* m_axisY;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEBARSERIES_H

plugins/declarative/declarativelineseries.h +4 -4

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVELINESERIES_H
             #define DECLARATIVELINESERIES_H
             #include "qlineseries.h"
             #include "declarativexyseries.h"
             #include <QDeclarativeListProperty>
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QDeclarativeParserStatus
             {
                 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")
             public:
                 explicit DeclarativeLineSeries(QObject *parent = 0);
                 QXYSeries *xySeries() { return this; }
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> declarativeChildren();
             public: // from QDeclarativeParserStatus
                 void classBegin() { DeclarativeXySeries::classBegin(); }
                 void componentComplete() { DeclarativeXySeries::componentComplete(); }
             public:
                 Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); }
                 Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
                 Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); }
                 Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); }
                 Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); }
             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);
                 void handleCountChanged(int index);
             private:
                 QAbstractAxis *m_axisX;
                 QAbstractAxis *m_axisY;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVELINESERIES_H

plugins/declarative/declarativescatterseries.h +4 -4

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVESCATTERSERIES_H
             #define DECLARATIVESCATTERSERIES_H
             #include "qscatterseries.h"
             #include "declarativexyseries.h"
             #include <QDeclarativeListProperty>
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QDeclarativeParserStatus
             {
                 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")
             public:
                 explicit DeclarativeScatterSeries(QObject *parent = 0);
                 QXYSeries *xySeries() { return this; }
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> declarativeChildren();
             public: // from QDeclarativeParserStatus
                 void classBegin() { DeclarativeXySeries::classBegin(); }
                 void componentComplete() { DeclarativeXySeries::componentComplete(); }
             public:
                 Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); }
                 Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
                 Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); }
                 Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); }
                 Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); }
             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);
                 void handleCountChanged(int index);
             private:
                 QAbstractAxis *m_axisX;
                 QAbstractAxis *m_axisY;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVESCATTERSERIES_H

plugins/declarative/declarativesplineseries.h +4 -4

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVESPLINESERIES_H
             #define DECLARATIVESPLINESERIES_H
             #include "qsplineseries.h"
             #include "declarativexyseries.h"
             #include <QDeclarativeParserStatus>
             #include <QDeclarativeListProperty>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QDeclarativeParserStatus
             {
                 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")
             public:
                 explicit DeclarativeSplineSeries(QObject *parent = 0);
                 QXYSeries *xySeries() { return this; }
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
                 QDeclarativeListProperty<QObject> declarativeChildren();
             public: // from QDeclarativeParserStatus
                 void classBegin() { DeclarativeXySeries::classBegin(); }
                 void componentComplete() { DeclarativeXySeries::componentComplete(); }
             public:
                 Q_INVOKABLE void append(qreal x, qreal y) { DeclarativeXySeries::append(x, y); }
                 Q_INVOKABLE void replace(qreal oldX, qreal oldY, qreal newX, qreal newY) { DeclarativeXySeries::replace(oldX, oldY, newX, newY); }
                 Q_INVOKABLE void remove(qreal x, qreal y) { DeclarativeXySeries::remove(x, y); }
                 Q_INVOKABLE void insert(int index, qreal x, qreal y) { DeclarativeXySeries::insert(index, x, y); }
                 Q_INVOKABLE void clear() { DeclarativeXySeries::clear(); }
                 Q_INVOKABLE QPointF at(int index) { return DeclarativeXySeries::at(index); }
             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);
                 void handleCountChanged(int index);
             public:
                 QAbstractAxis *m_axisX;
                 QAbstractAxis *m_axisY;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVESPLINESERIES_H

plugins/declarative/plugin.cpp +45 -5

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QtDeclarative/qdeclarativeextensionplugin.h>
             #include <QtDeclarative/qdeclarative.h>
             #include "qchart.h"
             #include "qabstractaxis.h"
             #include "qvalueaxis.h"
             #include "qbarcategoryaxis.h"
             #include "declarativechart.h"
             #include "declarativexypoint.h"
             #include "declarativelineseries.h"
             #include "declarativesplineseries.h"
             #include "declarativeareaseries.h"
             #include "declarativescatterseries.h"
             #include "declarativebarseries.h"
             #include "declarativepieseries.h"
             #include "qvxymodelmapper.h"
             #include "qhxymodelmapper.h"
             #include "qhpiemodelmapper.h"
             #include "qvpiemodelmapper.h"
             #include "qhbarmodelmapper.h"
             #include "qvbarmodelmapper.h"
             #include <QAbstractItemModel>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartQmlPlugin : public QDeclarativeExtensionPlugin
             {
                 Q_OBJECT
             public:
                 virtual void registerTypes(const char *uri)
                 {
                     Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
+                    // QtCommercial.Chart 1.0
                     qmlRegisterType<DeclarativeChart>(uri, 1, 0, "ChartView");
                     qmlRegisterType<DeclarativeXYPoint>(uri, 1, 0, "XYPoint");
                     qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
                     qmlRegisterType<DeclarativeSplineSeries>(uri, 1, 0, "SplineSeries");
                     qmlRegisterType<DeclarativeAreaSeries>(uri, 1, 0, "AreaSeries");
                     qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");
                     qmlRegisterType<DeclarativeStackedBarSeries>(uri, 1, 0, "StackedBarSeries");
                     qmlRegisterType<DeclarativePercentBarSeries>(uri, 1, 0, "PercentBarSeries");
-                    qmlRegisterType<DeclarativeHorizontalBarSeries>(uri, 1, 0, "HorizontalBarSeries");
-                    qmlRegisterType<DeclarativeHorizontalStackedBarSeries>(uri, 1, 0, "HorizontalStackedBarSeries");
-                    qmlRegisterType<DeclarativeHorizontalPercentBarSeries>(uri, 1, 0, "HorizontalPercentBarSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
                     qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice");
                     qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
                     qmlRegisterType<QHXYModelMapper>(uri, 1, 0, "HXYModelMapper");
                     qmlRegisterType<QVXYModelMapper>(uri, 1, 0, "VXYModelMapper");
                     qmlRegisterType<QHPieModelMapper>(uri, 1, 0, "HPieModelMapper");
                     qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
                     qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
                     qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
-                    qmlRegisterType<QValueAxis>(uri, 1, 0, "ValueAxis");
+                    qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis");
                     qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis");
                     qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
                                                       QLatin1String("Trying to create uncreatable: Legend."));
                     qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries",
                                                       QLatin1String("Trying to create uncreatable: XYSeries."));
                     qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
                                                       QLatin1String("Trying to create uncreatable: AbstractItemModel."));
                     qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
                                                       QLatin1String("Trying to create uncreatable: XYModelMapper."));
                     qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
                                                       QLatin1String("Trying to create uncreatable: PieModelMapper."));
                     qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 0, "BarModelMapper",
                                                       QLatin1String("Trying to create uncreatable: BarModelMapper."));
                     qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries",
                                                       QLatin1String("Trying to create uncreatable: AbstractSeries."));
                     qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 0, "AbstractBarSeries",
                                                          QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
                     qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
                                                       QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
+                    // QtCommercial.Chart 1.1
+                    qmlRegisterType<DeclarativeChart>(uri, 1, 1, "ChartView");
+                    qmlRegisterType<DeclarativeXYPoint>(uri, 1, 1, "XYPoint");
+                    qmlRegisterType<DeclarativeScatterSeries, 1>(uri, 1, 1, "ScatterSeries");
+                    qmlRegisterType<DeclarativeLineSeries, 1>(uri, 1, 1, "LineSeries");
+                    qmlRegisterType<DeclarativeSplineSeries, 1>(uri, 1, 1, "SplineSeries");
+                    qmlRegisterType<DeclarativeAreaSeries, 1>(uri, 1, 1, "AreaSeries");
+                    qmlRegisterType<DeclarativeBarSeries, 1>(uri, 1, 1, "BarSeries");
+                    qmlRegisterType<DeclarativeStackedBarSeries, 1>(uri, 1, 1, "StackedBarSeries");
+                    qmlRegisterType<DeclarativePercentBarSeries, 1>(uri, 1, 1, "PercentBarSeries");
+                    qmlRegisterType<DeclarativeHorizontalBarSeries, 1>(uri, 1, 1, "HorizontalBarSeries");
+                    qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 1>(uri, 1, 1, "HorizontalStackedBarSeries");
+                    qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 1>(uri, 1, 1, "HorizontalPercentBarSeries");
+                    qmlRegisterType<DeclarativePieSeries>(uri, 1, 1, "PieSeries");
+                    qmlRegisterType<QPieSlice>(uri, 1, 1, "PieSlice");
+                    qmlRegisterType<DeclarativeBarSet>(uri, 1, 1, "BarSet");
+                    qmlRegisterType<QHXYModelMapper>(uri, 1, 1, "HXYModelMapper");
+                    qmlRegisterType<QVXYModelMapper>(uri, 1, 1, "VXYModelMapper");
+                    qmlRegisterType<QHPieModelMapper>(uri, 1, 1, "HPieModelMapper");
+                    qmlRegisterType<QVPieModelMapper>(uri, 1, 1, "VPieModelMapper");
+                    qmlRegisterType<QHBarModelMapper>(uri, 1, 1, "HBarModelMapper");
+                    qmlRegisterType<QVBarModelMapper>(uri, 1, 1, "VBarModelMapper");
+                    qmlRegisterType<QValueAxis>(uri, 1, 1, "ValueAxis");
+                    qmlRegisterType<QBarCategoryAxis>(uri, 1, 1, "BarCategoryAxis");
+                    qmlRegisterUncreatableType<QLegend>(uri, 1, 1, "Legend",
+                                                      QLatin1String("Trying to create uncreatable: Legend."));
+                    qmlRegisterUncreatableType<QXYSeries>(uri, 1, 1, "XYSeries",
+                                                      QLatin1String("Trying to create uncreatable: XYSeries."));
+                    qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 1, "AbstractItemModel",
+                                                      QLatin1String("Trying to create uncreatable: AbstractItemModel."));
+                    qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 1, "XYModelMapper",
+                                                      QLatin1String("Trying to create uncreatable: XYModelMapper."));
+                    qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 1, "PieModelMapper",
+                                                      QLatin1String("Trying to create uncreatable: PieModelMapper."));
+                    qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 1, "BarModelMapper",
+                                                      QLatin1String("Trying to create uncreatable: BarModelMapper."));
+                    qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 1, "AbstractSeries",
+                                                      QLatin1String("Trying to create uncreatable: AbstractSeries."));
+                    qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 1, "AbstractBarSeries",
+                                                         QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
+                    qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 1, "AbstractAxis",
+                                                      QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
                 }
             };
             #include "plugin.moc"
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
             Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView
                 title: "default axes"
                 LineSeries {
                     name: "line series"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
                 ScatterSeries {
                     name: "scatter series"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "user defined axes"
                 ValueAxis {
                     id: axisX
                     min: 0
                     max: 10
                 }
                 ValueAxis {
                     id: axisY
                     min: 0
                     max: 6
                 }
                 LineSeries {
                     name: "line series"
                     axisX: axisX
                     axisY: axisY
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
                 ScatterSeries {
                     name: "scatter series"
                     axisX: axisX
                     axisY: axisY
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView
                 title: "user defined axes"
                 ValueAxis {
                     id: axisX
                     min: 0
                     max: 10
                     // TODO: property to fix orientation to "X" to make this the X default axis for all series
                     // that don't have user defined X axis
                 }
                 ValueAxis {
                     id: axisY
                     min: 0
                     max: 5
                     // TODO: property to fix orientation to "Y" to make this the Y default axis for all series
                     // that don't have user defined Y axis
                 }
                 LineSeries {
                     name: "line series"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
                 ScatterSeries {
                     name: "scatter series"
                     id: scatter
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
                 Component.onCompleted: {
                     // You can also set the axes dynamically
                     chartView.setAxisX(axisX, scatter);
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "configuring dynamically"
                 id: chartView
                 property int index: 0
                 Timer {
                     interval: 1000
                     repeat: true
                     running: true
                     onTriggered: {
                         switch (index) {
                         case 0:
                             chartView.axisX(lineSeries).max = 5;
                             chartView.axisY(lineSeries).max = 5;
                             break;
                         case 1:
                             chartView.axisX(scatterSeries).max = 10;
                             chartView.axisY(scatterSeries).max = 10;
                             break;
                         default:
                             chartView.axisX().max = 15;
                             chartView.axisY().max = 15;
                         }
                         index = (index + 1) % 3;
                     }
                 }
                 LineSeries {
                     id: lineSeries
                     name: "line series"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
                 ScatterSeries {
                     id: scatterSeries
                     name: "scatter series"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "series specific dynamic axes"
                 id: chartView
                 property int index: 0
                 Timer {
                     interval: 1000
                     repeat: true
                     running: true
                     onTriggered: {
                         switch (index) {
                         case 0:
                             lineAxisX.max = 5;
                             lineAxisY.max = 5;
                             scatterAxisX.max = 10;
                             scatterAxisY.max = 10;
                             break;
                         case 1:
                             lineAxisX.max = 10;
                             lineAxisY.max = 10;
                             scatterAxisX.max = 5;
                             scatterAxisY.max = 5;
                             break;
                         default:
                             chartView.axisX().max = 2;
                             chartView.axisY().max = 2;
                         }
                         index = (index + 1) % 3;
                     }
                 }
                 LineSeries {
                     id: lineSeries
                     name: "line series"
                     axisX: ValueAxis { id: lineAxisX }
                     axisY: ValueAxis { id: lineAxisY }
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
                 ScatterSeries {
                     id: scatterSeries
                     name: "scatter series"
                     axisX: ValueAxis { id: scatterAxisX }
                     axisY: ValueAxis { id: scatterAxisY }
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView
                 title: "dynamically created series"
                 property int index: 0
                 Timer {
                     interval: 1000
                     repeat: true
                     running: true
                     onTriggered: {
                         switch (index) {
                         case 0:
                             while (chartView.count)
                                 chartView.series(0).destroy();
                             var line = chartView.createSeries(ChartView.SeriesTypeLine, "line");
                             line.append(0, 0);
                             line.append(1.1, 2.1);
                             line.append(1.9, 3.3);
                             line.append(2.1, 2.1);
                             line.append(2.9, 4.9);
                             line.append(3.4, 3.0);
                             line.append(4.1, 3.3);
                             break;
                         case 1:
                             chartView.axisX().min = 0;
                             chartView.axisX().max = 4.5;
                             chartView.axisY().min = 0;
                             chartView.axisY().max = 4.5;
                             break;
                         default:
                             var scatter = chartView.createSeries(ChartView.SeriesTypeScatter, "scatter");
                             scatter.append(0, 0);
                             scatter.append(1.1, 2.1);
                             scatter.append(1.9, 3.3);
                             scatter.append(2.1, 2.1);
                             scatter.append(2.9, 4.9);
                             scatter.append(3.4, 3.0);
                             scatter.append(4.1, 3.3);
                         }
                         index = (index + 1) % 3;
                     }
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView
                 title: "switching axes dynamically"
                 Timer {
                     interval: 1000
                     repeat: true
                     running: true
                     onTriggered: {
                         if (lineSeries.axisX == valueAxis1)
                             lineSeries.axisX = valueAxis2;
                         else
                             lineSeries.axisX = valueAxis1;
                     }
                 }
                 ValueAxis {
                     id: valueAxis1
                     min: 0
                     max: 5
                 }
                 ValueAxis {
                     id: valueAxis2
                     min: 1
                     max: 6
                 }
                 LineSeries {
                     id: lineSeries
                     name: "line series"
                     axisX: valueAxis1
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView
                 title: "axis scale; different series"
                 LineSeries {
                     name: "line series"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                 }
                 ScatterSeries {
                     name: "scatter series"
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView
                 title: "Deprecated code"
                 property int index: 0
                 Component.onCompleted: {
                     // Calling createDefaultAxes in onCompleted is now deprecated. It needs to be tested,
                     // though, because some application may still use it
                     chartView.createDefaultAxes();
                 }
                 LineSeries {
                     name: "line series"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
                 ScatterSeries {
                     name: "scatter series"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "area series"
                 anchors.fill: parent
                 animationOptions: ChartView.SeriesAnimations
                 property variant series: areaSeries
                 AreaSeries {
                     id: areaSeries
                     name: "area 1"
                     upperSeries: LineSeries {
                         XYPoint { x: 0; y: 1 }
                         XYPoint { x: 1; y: 1 }
                         XYPoint { x: 2; y: 3 }
                         XYPoint { x: 3; y: 3 }
                         XYPoint { x: 4; y: 2 }
                         XYPoint { x: 5; y: 0 }
                         XYPoint { x: 6; y: 2 }
                         XYPoint { x: 7; y: 1 }
                         XYPoint { x: 8; y: 2 }
                         XYPoint { x: 9; y: 1 }
                         XYPoint { x: 10; y: 3 }
                         XYPoint { x: 11; y: 3 }
                     }
                     lowerSeries: LineSeries {
                         XYPoint { x: 0; y: 0 }
                         XYPoint { x: 1; y: 0 }
                         XYPoint { x: 2; y: 0 }
                         XYPoint { x: 3; y: 0 }
                         XYPoint { x: 4; y: 0 }
                         XYPoint { x: 5; y: 0 }
                         XYPoint { x: 6; y: 0 }
                         XYPoint { x: 7; y: 0 }
                         XYPoint { x: 8; y: 0 }
                         XYPoint { x: 9; y: 0 }
                         XYPoint { x: 10; y: 0 }
                         XYPoint { x: 11; y: 0 }
                     }
                     onNameChanged:              console.log(name + ".onNameChanged: " + name);
                     onVisibleChanged:           console.log(name + ".onVisibleChanged: " + visible);
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                     onSelected:                 console.log(name + ".onSelected");
                     onColorChanged:             console.log(name + ".onColorChanged: " + color);
                     onBorderColorChanged:       console.log(name + ".onBorderColorChanged: " + borderColor);
             //        onCountChanged:             console.log(name + ".onCountChanged: " + count);
                 }
                 AreaSeries {
                     name: "area 2"
                     upperSeries: LineSeries {
                         XYPoint { x: 0; y: 0.5 }
                         XYPoint { x: 1; y: 1.5 }
                         XYPoint { x: 2; y: 0.3 }
                         XYPoint { x: 3; y: 1.5 }
                         XYPoint { x: 4; y: 0.1 }
                         XYPoint { x: 5; y: 0.3 }
                         XYPoint { x: 6; y: 1.2 }
                         XYPoint { x: 7; y: 1.3 }
                         XYPoint { x: 8; y: 0.2 }
                         XYPoint { x: 9; y: 0.1 }
                         XYPoint { x: 10; y: 3.2 }
                         XYPoint { x: 11; y: 4.6 }
                     }
                     onNameChanged:              console.log(name + ".onNameChanged: " + name);
                     onVisibleChanged:           console.log(name + ".onVisibleChanged: " + visible);
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                     onSelected:                 console.log(name + ".onSelected");
                     onColorChanged:             console.log(name + ".onColorChanged: " + color);
                     onBorderColorChanged:       console.log(name + ".onBorderColorChanged: " + borderColor);
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "Bar series"
                 anchors.fill: parent
                 theme: ChartView.ChartThemeLight
                 legend.alignment: Qt.AlignBottom
                 animationOptions: ChartView.SeriesAnimations
                 property variant series: mySeries
                 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);
                         onPenChanged:               console.log("barset.onPenChanged: " + pen);
                         onBrushChanged:             console.log("barset.onBrushChanged: " + brush);
                         onLabelChanged:             console.log("barset.onLabelChanged: " + label);
                         onLabelBrushChanged:        console.log("barset.onLabelBrushChanged: " + labelBrush);
                         onLabelFontChanged:         console.log("barset.onLabelFontChanged: " + labelFont);
                         onColorChanged:             console.log("barset.onColorChanged: " + color);
                         onBorderColorChanged:       console.log("barset.onBorderColorChanged: " + color);
                         onLabelColorChanged:        console.log("barset.onLabelColorChanged: " + color);
                         onCountChanged:             console.log("barset.onCountChanged: " + count);
                         onValuesAdded:              console.log("barset.onValuesAdded: " + index + ", " + count);
                         onValuesRemoved:            console.log("barset.onValuesRemoved: " + index + ", " + count);
                         onValueChanged:             console.log("barset.onValuesChanged: " + index);
                     }
                     BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                     BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
                     onNameChanged:              console.log("groupedBarSeries.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("groupedBarSeries.onVisibleChanged: " + series.visible);
                     onClicked:                  console.log("groupedBarSeries.onClicked: " + barset + " " + index);
                     onHovered:                  console.log("groupedBarSeries.onHovered: " + barset + " " + status);
                     onLabelsVisibleChanged:     console.log("groupedBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("groupedBarSeries.onCountChanged: " + count);
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chartView
                 title: "Chart Title"
                 anchors.fill: parent
                 property variant series: chartView
                 LineSeries {
                     name: "line"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                 }
                 onVisibleChanged:                  console.log("chart.onVisibleChanged: " + visible);
                 onTitleColorChanged:               console.log("chart.onTitleColorChanged: " + color);
                 onBackgroundColorChanged:          console.log("chart.onBackgroundColorChanged: " + series.backgroundColor);
                 onDropShadowEnabledChanged:        console.log("chart.onDropShadowEnabledChanged: " + enabled);
                 onTopMarginChanged: {
                     console.log("chart.onTopMarginChanged: " + margin);
                     marginVisualizer.opacity = 1.0;
                 }
                 onBottomMarginChanged: {
                     console.log("chart.onBottomMarginChanged: " + margin);
                     marginVisualizer.opacity = 1.0;
                 }
                 onLeftMarginChanged: {
                     console.log("chart.onLeftMarginChanged: " + margin);
                     marginVisualizer.opacity = 1.0;
                 }
                 onRightMarginChanged: {
                     console.log("chart.onRightMarginChanged: " + margin);
                     marginVisualizer.opacity = 1.0;
                 }
                 legend.onVisibleChanged:           console.log("legend.onVisibleChanged: " + series.legend.visible);
                 legend.onBackgroundVisibleChanged: console.log("legend.onBackgroundVisibleChanged: " + visible);
                 legend.onColorChanged:             console.log("legend.onColorChanged: " + color);
                 legend.onBorderColorChanged:       console.log("legend.onBorderColorChanged: " + color);
                 legend.onLabelColorChanged:        console.log("legend.onLabelColorChanged: " + color);
                 ValueAxis{
                     onColorChanged:               console.log("axisX.onColorChanged: " + color);
                     onLabelsVisibleChanged:       console.log("axisX.onLabelsVisibleChanged: " + visible);
                     onLabelsColorChanged:         console.log("axisX.onLabelsColorChanged: " + color);
                     onVisibleChanged:             console.log("axisX.onVisibleChanged: " + visible);
                     onGridVisibleChanged:         console.log("axisX.onGridVisibleChanged: " + visible);
                     onShadesVisibleChanged:       console.log("axisX.onShadesVisibleChanged: " + visible);
                     onShadesColorChanged:         console.log("axisX.onShadesColorChanged: " + color);
                     onShadesBorderColorChanged:   console.log("axisX.onShadesBorderColorChanged: " + color);
                     onMinChanged:                 console.log("axisX.onMinChanged: " + min);
                     onMaxChanged:                 console.log("axisX.onMaxChanged: " + max);
                 }
                 ValueAxis{
                     onColorChanged:               console.log("axisY.onColorChanged: " + color);
                     onLabelsVisibleChanged:       console.log("axisY.onLabelsVisibleChanged: " + visible);
                     onLabelsColorChanged:         console.log("axisY.onLabelsColorChanged: " + color);
                     onVisibleChanged:             console.log("axisY.onVisibleChanged: " + visible);
                     onGridVisibleChanged:         console.log("axisY.onGridVisibleChanged: " + visible);
                     onShadesVisibleChanged:       console.log("axisY.onShadesVisibleChanged: " + visible);
                     onShadesColorChanged:         console.log("axisY.onShadesColorChanged: " + color);
                     onShadesBorderColorChanged:   console.log("axisY.onShadesBorderColorChanged: " + color);
                     onMinChanged:                 console.log("axisY.onMinChanged: " + min);
                     onMaxChanged:                 console.log("axisY.onMaxChanged: " + max);
                 }
                 Rectangle {
                     id: marginVisualizer
                     color: "transparent"
                     border.color: "red"
                     anchors.fill: parent
                     anchors.topMargin: parent.topMargin
                     anchors.bottomMargin: parent.bottomMargin
                     anchors.leftMargin: parent.leftMargin
                     anchors.rightMargin: parent.rightMargin
                     opacity: 0.0
                     onOpacityChanged: if (opacity > 0.9) opacity = 0.0;
                     Behavior on opacity {
                         NumberAnimation { duration: 800 }
                     }
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 property variant series: lineSeries
                 title: "line series"
                 anchors.fill: parent
                 animationOptions: ChartView.SeriesAnimations
                 LineSeries {
                     id: lineSeries
                     name: "line 1"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                     onNameChanged:              console.log("lineSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("lineSeries.onVisibleChanged: " + visible);
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                     onPointReplaced:            console.log("lineSeries.onPointReplaced: " + index);
                     onPointRemoved:             console.log("lineSeries.onPointRemoved: " + index);
                     onPointAdded:               console.log("lineSeries.onPointAdded: " + series.at(index).x + ", " + series.at(index).y);
                     onColorChanged:             console.log("lineSeries.onColorChanged: " + color);
                     onCountChanged:             console.log("lineSeries.onCountChanged: " + count);
                 }
                 LineSeries {
                     name: "line 2"
                     XYPoint { x: 1.1; y: 1.1 }
                     XYPoint { x: 1.9; y: 2.3 }
                     XYPoint { x: 2.1; y: 1.1 }
                     XYPoint { x: 2.9; y: 3.9 }
                     XYPoint { x: 3.4; y: 2.0 }
                     XYPoint { x: 4.1; y: 2.3 }
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "Percent bar series"
                 anchors.fill: parent
                 theme: ChartView.ChartThemeLight
                 legend.alignment: Qt.AlignBottom
                 animationOptions: ChartView.SeriesAnimations
                 property variant series: mySeries
                 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);
                         onHovered:                  console.log("barset.onHovered: " + status);
                         onPenChanged:               console.log("barset.onPenChanged: " + pen);
                         onBrushChanged:             console.log("barset.onBrushChanged: " + brush);
                         onLabelChanged:             console.log("barset.onLabelChanged: " + label);
                         onLabelBrushChanged:        console.log("barset.onLabelBrushChanged: " + labelBrush);
                         onLabelFontChanged:         console.log("barset.onLabelFontChanged: " + labelFont);
                         onColorChanged:             console.log("barset.onColorChanged: " + color);
                         onBorderColorChanged:       console.log("barset.onBorderColorChanged: " + color);
                         onLabelColorChanged:        console.log("barset.onLabelColorChanged: " + color);
                         onCountChanged:             console.log("barset.onCountChanged: " + count);
                         onValuesAdded:              console.log("barset.onValuesAdded: " + index + ", " + count);
                         onValuesRemoved:            console.log("barset.onValuesRemoved: " + index + ", " + count);
                         onValueChanged:             console.log("barset.onValuesChanged: " + index);
                     }
                     BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                     BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
                     onNameChanged:              console.log("percentBarSeries.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("percentBarSeries.onVisibleChanged: " + series.visible);
                     onClicked:                  console.log("percentBarSeries.onClicked: " + barset + " " + index);
                     onHovered:                  console.log("percentBarSeries.onHovered: " + barset + " " + status);
                     onLabelsVisibleChanged:     console.log("percentBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("percentBarSeries.onCountChanged: " + count);
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 id: chart
                 title: "pie series"
                 animationOptions: ChartView.SeriesAnimations
                 property variant series: pieSeries
                 PieSeries {
                     id: pieSeries
                     name: "pie"
                     PieSlice { label: "slice1"; value: 11;
                         onValueChanged:         console.log("slice.onValueChanged: " + value);
                         onLabelVisibleChanged:  console.log("slice.onLabelVisibleChanged: " + labelVisible);
                         onPenChanged:           console.log("slice.onPenChanged: " + pen);
                         onBorderColorChanged:   console.log("slice.onBorderColorChanged: " + borderColor);
                         onBorderWidthChanged:   console.log("slice.onBorderWidthChanged: " + borderWidth);
                         onBrushChanged:         console.log("slice.onBrushChanged: " + brush);
                         onColorChanged:         console.log("slice.onColorChanged: " + color);
                         onLabelColorChanged:    console.log("slice.onLabelColorChanged: " + labelColor);
                         onLabelBrushChanged:    console.log("slice.onLabelBrushChanged: " + labelBrush);
                         onLabelFontChanged:     console.log("slice.onLabelFontChanged: " + labelFont);
                         onPercentageChanged:    console.log("slice.onPercentageChanged: " + percentage);
                         onStartAngleChanged:    console.log("slice.onStartAngleChanged: " + startAngle);
                         onAngleSpanChanged:     console.log("slice.onAngleSpanChanged: " + angleSpan);
                         onClicked:              console.log("slice.onClicked: " + label);
                         onHovered:              console.log("slice.onHovered: " + state);
                     }
                     PieSlice { label: "slice2"; value: 22 }
                     PieSlice { label: "slice3"; value: 33 }
                     PieSlice { label: "slice4"; value: 44 }
                     onNameChanged:              console.log("pieSeries.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("pieSeries.onVisibleChanged: " + series.visible);
                     onClicked:                  console.log("pieSeries.onClicked: " + slice.label);
                     onHovered:                  console.log("pieSeries.onHovered: " + slice.label);
                     onAdded:                    console.log("pieSeries.onAdded: " + slices);
                     onSliceAdded:               console.log("pieSeries.onSliceAdded: " + slice.label);
                     onRemoved:                  console.log("pieSeries.onRemoved: " + slices);
                     onSliceRemoved:             console.log("pieSeries.onSliceRemoved: " + slice.label);
                     onCountChanged:             console.log("pieSeries.onCountChanged: " + series.count);
                     onSumChanged:               console.log("pieSeries.onSumChanged: " + series.sum);
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "scatter series"
                 property variant series: scatterSeries
                 animationOptions: ChartView.SeriesAnimations
                 ScatterSeries {
                     id: scatterSeries
                     name: "scatter 1"
                     XYPoint { x: 1.5; y: 1.5 }
                     XYPoint { x: 1.5; y: 1.6 }
                     XYPoint { x: 1.57; y: 1.55 }
                     XYPoint { x: 1.8; y: 1.8 }
                     XYPoint { x: 1.9; y: 1.6 }
                     XYPoint { x: 2.1; y: 1.3 }
                     XYPoint { x: 2.5; y: 2.1 }
                     onNameChanged:              console.log("scatterSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("scatterSeries.onVisibleChanged: " + visible);
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                     onPointReplaced:            console.log("scatterSeries.onPointReplaced: " + index);
                     onPointRemoved:             console.log("scatterSeries.onPointRemoved: " + index);
                     onPointAdded:               console.log("scatterSeries.onPointAdded: " + series.at(index).x + ", " + series.at(index).y);
                     onColorChanged:             console.log("scatterSeries.onColorChanged: " + color);
                     onBorderColorChanged:       console.log("scatterSeries.onBorderColorChanged: " + borderColor);
                     onCountChanged:             console.log("scatterSeries.onCountChanged: " + count);
                 }
                 ScatterSeries {
                     name: "scatter2"
                     XYPoint { x: 2.0; y: 2.0 }
                     XYPoint { x: 2.0; y: 2.1 }
                     XYPoint { x: 2.07; y: 2.05 }
                     XYPoint { x: 2.2; y: 2.9 }
                     XYPoint { x: 2.4; y: 2.7 }
                     XYPoint { x: 2.67; y: 2.65 }
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "spline series"
                 anchors.fill: parent
                 property variant series: splineSeries
                 animationOptions: ChartView.SeriesAnimations
                 SplineSeries {
                     id: splineSeries
                     name: "spline 1"
                     XYPoint { x: 0; y: 0 }
                     XYPoint { x: 1.1; y: 2.1 }
                     XYPoint { x: 1.9; y: 3.3 }
                     XYPoint { x: 2.1; y: 2.1 }
                     XYPoint { x: 2.9; y: 4.9 }
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
                     onNameChanged:              console.log("splineSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("splineSeries.onVisibleChanged: " + visible);
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                     onPointReplaced:            console.log("splineSeries.onPointReplaced: " + index);
                     onPointRemoved:             console.log("splineSeries.onPointRemoved: " + index);
                     onPointAdded:               console.log("splineSeries.onPointAdded: " + series.at(index).x + ", " + series.at(index).y);
                     onColorChanged:             console.log("splineSeries.onColorChanged: " + color);
                     onCountChanged:             console.log("splineSeries.onCountChanged: " + count);
                 }
                 SplineSeries {
                     name: "spline 2"
                     XYPoint { x: 1.1; y: 1.1 }
                     XYPoint { x: 1.9; y: 2.3 }
                     XYPoint { x: 2.1; y: 1.1 }
                     XYPoint { x: 2.9; y: 3.9 }
                     XYPoint { x: 3.4; y: 2.0 }
                     XYPoint { x: 4.1; y: 2.3 }
                     onClicked:                  console.log(name + ".onClicked: " + point.x + ", " + point.y);
                 }
             }

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.0
+            import QtCommercial.Chart 1.1
             ChartView {
                 title: "Stacked bar series"
                 anchors.fill: parent
                 theme: ChartView.ChartThemeLight
                 legend.alignment: Qt.AlignBottom
                 animationOptions: ChartView.SeriesAnimations
                 property variant series: mySeries
                 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);
                         onPenChanged:               console.log("barset.onPenChanged: " + pen);
                         onBrushChanged:             console.log("barset.onBrushChanged: " + brush);
                         onLabelChanged:             console.log("barset.onLabelChanged: " + label);
                         onLabelBrushChanged:        console.log("barset.onLabelBrushChanged: " + labelBrush);
                         onLabelFontChanged:         console.log("barset.onLabelFontChanged: " + labelFont);
                         onColorChanged:             console.log("barset.onColorChanged: " + color);
                         onBorderColorChanged:       console.log("barset.onBorderColorChanged: " + color);
                         onLabelColorChanged:        console.log("barset.onLabelColorChanged: " + color);
                         onCountChanged:             console.log("barset.onCountChanged: " + count);
                         onValuesAdded:              console.log("barset.onValuesAdded: " + index + ", " + count);
                         onValuesRemoved:            console.log("barset.onValuesRemoved: " + index + ", " + count);
                         onValueChanged:             console.log("barset.onValuesChanged: " + index);
                     }
                     BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                     BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
                     onNameChanged:              console.log("stackedBarSeries.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("stackedBarSeries.onVisibleChanged: " + series.visible);
                     onClicked:                  console.log("stackedBarSeries.onClicked: " + barset + " " + index);
                     onHovered:                  console.log("stackedBarSeries.onHovered: " + barset + " " + status);
                     onLabelsVisibleChanged:     console.log("stackedBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("stackedBarSeries.onCountChanged: " + count);
                 }
             }

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