diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp
index 49fd1d4..ce3004f 100644
--- a/plugins/declarative/plugin.cpp
+++ b/plugins/declarative/plugin.cpp
@@ -126,6 +126,7 @@ public:
         qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 1>(uri, 1, 1, "HorizontalPercentBarSeries");
         qmlRegisterType<DeclarativePieSeries>(uri, 1, 1, "PieSeries");
         qmlRegisterType<DeclarativeBarSet>(uri, 1, 1, "BarSet");
+        qmlRegisterType<QValueAxis>(uri, 1, 1, "ValueAxis");
 #ifndef QT_ON_ARM
         qmlRegisterType<QDateTimeAxis>(uri, 1, 1, "DateTimeAxis");
 #endif
diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
index c47c366..e3ee753 100644
--- a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
+++ b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
@@ -100,11 +100,20 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
   Defines the maximum value on the axis.
 */
 
+/*!
+  \property QBarCategoryAxis::count
+  The count of categories.
+*/
+/*!
+  \qmlproperty int BarCategoryAxis::count
+  The count of categories.
+*/
 
 /*!
   \fn void QBarCategoryAxis::categoriesChanged()
   Axis emits signal when the categories of the axis has changed.
 */
+
 /*!
   \fn void QBarCategoryAxis::minChanged(const QString &min)
   Axis emits signal when \a min of axis has changed.
@@ -124,6 +133,15 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
+  \fn void QBarCategoryAxis::countChanged()
+  Axis emits signal when the count of categories has changed.
+*/
+/*!
+  \qmlsignal BarCategoryAxis::onCountChanged()
+  Axis emits signal when the count of categories has changed.
+*/
+
+/*!
   \fn void QBarCategoryAxis::rangeChanged(const QString &min, const QString &max)
   Axis emits signal when \a min or \a max of axis has changed.
 */
@@ -184,6 +202,7 @@ void QBarCategoryAxis::append(const QStringList &categories)
         setRange(d->m_minCategory, d->m_categories.last());
 
     emit categoriesChanged();
+    emit countChanged();
 }
 
 /*!
@@ -209,6 +228,7 @@ void QBarCategoryAxis::append(const QString &category)
         setRange(d->m_minCategory, d->m_categories.last());
 
     emit categoriesChanged();
+    emit countChanged();
 }
 
 /*!
@@ -234,6 +254,7 @@ void QBarCategoryAxis::remove(const QString &category)
             setRange(QString::null, QString::null);
         }
         emit categoriesChanged();
+        emit countChanged();
     }
 }
 
@@ -265,11 +286,12 @@ void QBarCategoryAxis::insert(int index, const QString &category)
     }
 
     emit categoriesChanged();
+    emit countChanged();
 }
 
 /*!
     Replaces \a oldCategory with \a newCategory. If \a oldCategory does not exits on the axis nothing is done.
-    A \a newVategory has to be valid QStrings and can not be duplicated. In case of replacing minimum or maximum category,
+    A \a newCategory has to be valid QStrings and can not be duplicated. In case of replacing minimum or maximum category,
     minimum and maximum of axis is updated accordingly.
 */
 void QBarCategoryAxis::replace(const QString &oldCategory, const QString &newCategory)
@@ -288,6 +310,7 @@ void QBarCategoryAxis::replace(const QString &oldCategory, const QString &newCat
             d->emitUpdated();
         }
         emit categoriesChanged();
+        emit countChanged();
     }
 }
 
@@ -300,6 +323,7 @@ void QBarCategoryAxis::clear()
     d->m_categories.clear();
     setRange(QString::null, QString::null);
     emit categoriesChanged();
+    emit countChanged();
 }
 
 /*!
diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis.h b/src/axis/barcategoryaxis/qbarcategoryaxis.h
index 26dc3fd..2eb89e8 100644
--- a/src/axis/barcategoryaxis/qbarcategoryaxis.h
+++ b/src/axis/barcategoryaxis/qbarcategoryaxis.h
@@ -33,6 +33,7 @@ class QTCOMMERCIALCHART_EXPORT QBarCategoryAxis : public QAbstractAxis
     Q_PROPERTY(QStringList categories READ categories WRITE setCategories NOTIFY categoriesChanged)
     Q_PROPERTY(QString min READ min WRITE setMin NOTIFY minChanged)
     Q_PROPERTY(QString max READ max WRITE setMax NOTIFY maxChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
 
 public:
     explicit QBarCategoryAxis(QObject *parent = 0);
@@ -66,6 +67,7 @@ Q_SIGNALS:
     void minChanged(const QString &min);
     void maxChanged(const QString &max);
     void rangeChanged(const QString &min, const QString &max);
+    void countChanged();
 
 private:
     Q_DECLARE_PRIVATE(QBarCategoryAxis)
diff --git a/src/axis/categoryaxis/qcategoryaxis.cpp b/src/axis/categoryaxis/qcategoryaxis.cpp
index 3cdaf0b..9fab1ae 100644
--- a/src/axis/categoryaxis/qcategoryaxis.cpp
+++ b/src/axis/categoryaxis/qcategoryaxis.cpp
@@ -84,6 +84,24 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 
 /*!
+  \property QCategoryAxis::count
+  The count of categories.
+*/
+/*!
+  \qmlproperty int CategoryAxis::count
+  The count of categories.
+*/
+
+/*!
+  \property QCategoryAxis::categoriesLabels
+  The category labels as a string list.
+*/
+/*!
+  \qmlproperty StringList CategoryAxis::categoriesLabels
+  The category labels as a list of strings.
+*/
+
+/*!
     Constructs an axis object which is a child of \a parent.
 */
 QCategoryAxis::QCategoryAxis(QObject *parent):
diff --git a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
index 555af3a..0cf294f 100644
--- a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
+++ b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
@@ -175,6 +175,7 @@ void tst_QBarCategoriesAxis::append()
     QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
     QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
     QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
+    QSignalSpy spy4(&axis, SIGNAL(countChanged()));
 
     axis.append(categories);
 
@@ -192,6 +193,7 @@ void tst_QBarCategoriesAxis::append()
     QCOMPARE(spy1.count(), 1);
     QCOMPARE(spy2.count(), 1);
     QCOMPARE(spy3.count(), 1);
+    QCOMPARE(spy4.count(), 1);
 }
 
 void tst_QBarCategoriesAxis::append2_data()
@@ -211,6 +213,7 @@ void tst_QBarCategoriesAxis::append2()
     QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
     QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
     QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
+    QSignalSpy spy4(&axis, SIGNAL(countChanged()));
 
     foreach(QString category, categories)
         axis.append(category);
@@ -229,6 +232,7 @@ void tst_QBarCategoriesAxis::append2()
     QCOMPARE(spy1.count(), categories.count());
     QCOMPARE(spy2.count(), 1);
     QCOMPARE(spy3.count(), categories.count());
+    QCOMPARE(spy4.count(), categories.count());
 }
 
 void tst_QBarCategoriesAxis::at_data()
@@ -254,6 +258,7 @@ void tst_QBarCategoriesAxis::at()
     QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
     QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
     QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
+    QSignalSpy spy4(&axis, SIGNAL(countChanged()));
 
     QCOMPARE(axis.at(index), string);
 
@@ -271,6 +276,7 @@ void tst_QBarCategoriesAxis::at()
     QCOMPARE(spy1.count(), 0);
     QCOMPARE(spy2.count(), 0);
     QCOMPARE(spy3.count(), 0);
+    QCOMPARE(spy4.count(), 0);
 }
 
 void tst_QBarCategoriesAxis::categories_data()
@@ -289,6 +295,7 @@ void tst_QBarCategoriesAxis::categories()
     QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
     QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
     QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
+    QSignalSpy spy4(&axis, SIGNAL(countChanged()));
 
     axis.setCategories(categories);
     QCOMPARE(axis.categories(), categories);
@@ -307,7 +314,7 @@ void tst_QBarCategoriesAxis::categories()
     QCOMPARE(spy1.count(), 1);
     QCOMPARE(spy2.count(), 1);
     QCOMPARE(spy3.count(), 1);
-
+    QCOMPARE(spy4.count(), 1);
 }
 
 void tst_QBarCategoriesAxis::clear_data()
@@ -329,6 +336,7 @@ void tst_QBarCategoriesAxis::clear()
     QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
     QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
     QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
+    QSignalSpy spy4(&axis, SIGNAL(countChanged()));
 
     axis.clear();
     QCOMPARE(axis.categories(), QStringList());
@@ -353,6 +361,7 @@ void tst_QBarCategoriesAxis::clear()
     QCOMPARE(spy1.count(), 3);
     QCOMPARE(spy2.count(), 3);
     QCOMPARE(spy3.count(), 3);
+    QCOMPARE(spy4.count(), 3);
 }
 
 void tst_QBarCategoriesAxis::count_data()
@@ -375,6 +384,7 @@ void tst_QBarCategoriesAxis::count()
     QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
     QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
     QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
+    QSignalSpy spy4(&axis, SIGNAL(countChanged()));
 
     QCOMPARE(axis.count(), count);
 
@@ -382,6 +392,7 @@ void tst_QBarCategoriesAxis::count()
     QCOMPARE(spy1.count(), 0);
     QCOMPARE(spy2.count(), 0);
     QCOMPARE(spy3.count(), 0);
+    QCOMPARE(spy4.count(), 0);
 
     m_chart->setAxisX(&axis, m_series);
     m_view->show();
@@ -411,6 +422,7 @@ void tst_QBarCategoriesAxis::insert()
     QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
     QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
     QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
+    QSignalSpy spy4(&axis, SIGNAL(countChanged()));
 
     axis.insert(index, category);
     QCOMPARE(axis.at(index),category);
@@ -419,6 +431,7 @@ void tst_QBarCategoriesAxis::insert()
     QCOMPARE(spy1.count(), 0);
     QCOMPARE(spy2.count(), 0);
     QCOMPARE(spy3.count(), 0);
+    QCOMPARE(spy4.count(), 1);
 
     m_chart->setAxisX(&axis, m_series);
     m_view->show();
@@ -451,6 +464,7 @@ void tst_QBarCategoriesAxis::remove()
     QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
     QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
     QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
+    QSignalSpy spy4(&axis, SIGNAL(countChanged()));
 
     axis.remove(category);
     QCOMPARE(axis.categories(),result);
@@ -459,6 +473,7 @@ void tst_QBarCategoriesAxis::remove()
     QCOMPARE(spy1.count(), maxCount);
     QCOMPARE(spy2.count(), minCount);
     QCOMPARE(spy3.count(), rangeCount);
+    QCOMPARE(spy4.count(), 1);
 }
 
 void tst_QBarCategoriesAxis::max_raw_data()
@@ -478,6 +493,7 @@ void tst_QBarCategoriesAxis::max_raw()
     QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString)));
     QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString)));
     QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString,QString)));
+    QSignalSpy spy4(m_baraxis, SIGNAL(countChanged()));
 
     m_baraxis->setMax(max);
     QCOMPARE(m_baraxis->max(), max);
@@ -486,6 +502,7 @@ void tst_QBarCategoriesAxis::max_raw()
     QCOMPARE(spy1.count(), 1);
     QCOMPARE(spy2.count(), 0);
     QCOMPARE(spy3.count(), 1);
+    QCOMPARE(spy4.count(), 0);
 }
 
 void tst_QBarCategoriesAxis::max_data()
@@ -529,6 +546,7 @@ void tst_QBarCategoriesAxis::min_raw()
     QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString)));
     QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString)));
     QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString,QString)));
+    QSignalSpy spy4(m_baraxis, SIGNAL(countChanged()));
 
     m_baraxis->setMin(min);
     QCOMPARE(m_baraxis->min(), min);
@@ -537,7 +555,7 @@ void tst_QBarCategoriesAxis::min_raw()
     QCOMPARE(spy1.count(), 0);
     QCOMPARE(spy2.count(), 1);
     QCOMPARE(spy3.count(), 1);
-
+    QCOMPARE(spy4.count(), 0);
 }
 
 void tst_QBarCategoriesAxis::min_data()
@@ -585,6 +603,7 @@ void tst_QBarCategoriesAxis::range_raw()
     QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString)));
     QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString)));
     QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString,QString)));
+    QSignalSpy spy4(m_baraxis, SIGNAL(countChanged()));
 
     m_baraxis->setRange(min, max);
     QCOMPARE(m_baraxis->min(), min);
@@ -594,6 +613,7 @@ void tst_QBarCategoriesAxis::range_raw()
     QCOMPARE(spy1.count(), 1);
     QCOMPARE(spy2.count(), 1);
     QCOMPARE(spy3.count(), 1);
+    QCOMPARE(spy4.count(), 0);
 }
 
 void tst_QBarCategoriesAxis::range_data()
diff --git a/tests/auto/qml-qtquicktest/tst_barcategoryaxis.qml b/tests/auto/qml-qtquicktest/tst_barcategoryaxis.qml
new file mode 100644
index 0000000..7db1560
--- /dev/null
+++ b/tests/auto/qml-qtquicktest/tst_barcategoryaxis.qml
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** 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 QtQuickTest 1.0
+import QtCommercial.Chart 1.2
+
+Rectangle {
+    width: 400
+    height: 300
+
+    TestCase {
+        id: tc1
+        name: "tst_qml-qtquicktest BarCategoryAxis"
+        when: windowShown
+
+        function test_minMax() {
+            compare(barSeries1.axisX.min, "Jan", "AxisX min");
+            compare(barSeries1.axisX.max, "Jun", "AxisX max");
+            compare(barSeries1.axisY.min, 0, "AxisY min");
+            compare(barSeries1.axisY.max, 10, "AxisY max");
+        }
+
+        function test_categories() {
+            compare(barSeries1.axisX.count, 6, "AxisX count");
+
+            // Replace categories
+            var cat = barSeries1.axisX.categories;
+            barSeries1.axisX.categories = ["Tam", "Hel", "Maa", "Huh"];
+            compare(barSeries1.axisX.count, 4, "AxisX count");
+            compare(categoriesCountChangedSpy.count, 1, "onCountChanged");
+            compare(categoriesChangedSpy.count, 1, "onCategoriesChanged");
+
+            // Reset the original categories
+            barSeries1.axisX.categories = cat;
+            compare(barSeries1.axisX.count, 6, "AxisX count");
+            compare(categoriesCountChangedSpy.count, 2, "onCountChanged");
+            compare(categoriesChangedSpy.count, 2, "onCategoriesChanged");
+        }
+    }
+
+    ChartView {
+        id: chartView
+        anchors.fill: parent
+
+        BarSeries {
+            id: barSeries1
+            axisX: BarCategoryAxis {
+                id: axisX
+                categories: ["Jan", "Feb", "Mar", "Apr", "May", "Jun" ]
+            }
+            axisY: ValuesAxis {
+                id: axisY
+                min: 0
+                max: 10
+            }
+        }
+
+        SignalSpy {
+            id: categoriesCountChangedSpy
+            target: axisX
+            signalName: "countChanged"
+        }
+        SignalSpy {
+            id: categoriesChangedSpy
+            target: axisX
+            signalName: "categoriesChanged"
+        }
+    }
+}
diff --git a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_1.qml b/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_1.qml
new file mode 100644
index 0000000..571d4ea
--- /dev/null
+++ b/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_1.qml
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** 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 QtQuickTest 1.0
+import QtCommercial.Chart 1.1
+
+Rectangle {
+    width: 400
+    height: 300
+
+    TestCase {
+        id: tc1
+        name: "tst_qml-qtquicktest BarCategoryAxis 1.1"
+        when: windowShown
+
+        function test_minMax() {
+            compare(barSeries1.axisX.min, "Jan", "AxisX min");
+            compare(barSeries1.axisX.max, "Jun", "AxisX max");
+            compare(barSeries1.axisY.min, 0, "AxisY min");
+            compare(barSeries1.axisY.max, 10, "AxisY max");
+        }
+
+        function test_categories() {
+            compare(barSeries1.axisX.count, 6, "AxisX count");
+
+            // Replace categories
+            var cat = barSeries1.axisX.categories;
+            barSeries1.axisX.categories = ["Tam", "Hel", "Maa", "Huh"];
+            compare(barSeries1.axisX.count, 4, "AxisX count");
+            compare(categoriesCountChangedSpy.count, 1, "onCountChanged");
+            compare(categoriesChangedSpy.count, 1, "onCategoriesChanged");
+
+            // Reset the original categories
+            barSeries1.axisX.categories = cat;
+            compare(barSeries1.axisX.count, 6, "AxisX count");
+            compare(categoriesCountChangedSpy.count, 2, "onCountChanged");
+            compare(categoriesChangedSpy.count, 2, "onCategoriesChanged");
+        }
+    }
+
+    ChartView {
+        id: chartView
+        anchors.fill: parent
+
+        BarSeries {
+            id: barSeries1
+            axisX: BarCategoryAxis {
+                id: axisX
+                categories: ["Jan", "Feb", "Mar", "Apr", "May", "Jun" ]
+            }
+            axisY: ValuesAxis {
+                id: axisY
+                min: 0
+                max: 10
+            }
+        }
+
+        SignalSpy {
+            id: categoriesCountChangedSpy
+            target: axisX
+            signalName: "countChanged"
+        }
+        SignalSpy {
+            id: categoriesChangedSpy
+            target: axisX
+            signalName: "categoriesChanged"
+        }
+    }
+}
diff --git a/tests/auto/qml-qtquicktest/tst_categoriesaxis.qml b/tests/auto/qml-qtquicktest/tst_categoryaxis.qml
similarity index 100%
rename from tests/auto/qml-qtquicktest/tst_categoriesaxis.qml
rename to tests/auto/qml-qtquicktest/tst_categoryaxis.qml
diff --git a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_1.qml b/tests/auto/qml-qtquicktest/tst_categoryaxis_1_1.qml
new file mode 100644
index 0000000..e2b6003
--- /dev/null
+++ b/tests/auto/qml-qtquicktest/tst_categoryaxis_1_1.qml
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** 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 QtQuickTest 1.0
+import QtCommercial.Chart 1.1
+
+Rectangle {
+    width: 400
+    height: 300
+
+    TestCase {
+        id: tc1
+        name: "tst_qml-qtquicktest CategoryAxis 1.1"
+        when: windowShown
+
+        function test_minMax() {
+            compare(lineSeries1.axisX.min, 0, "AxisX min");
+            compare(lineSeries1.axisX.max, 10, "AxisX max");
+            compare(lineSeries1.axisY.min, 0, "AxisY min");
+            compare(lineSeries1.axisY.max, 10, "AxisY max");
+        }
+
+        function test_categories() {
+            compare(lineSeries1.axisY.startValue, 0, "AxisY start value");
+            compare(lineSeries1.axisY.count, 3, "AxisY count");
+            compare(lineSeries1.axisY.categoriesLabels[0], "label0", "AxisY categories labels");
+            compare(lineSeries1.axisY.categoriesLabels[1], "label1", "AxisY categories labels");
+            compare(lineSeries1.axisY.categoriesLabels[2], "label2", "AxisY categories labels");
+        }
+    }
+
+    ChartView {
+        id: chartView
+        anchors.fill: parent
+
+        LineSeries {
+            id: lineSeries1
+            axisX: ValuesAxis {
+                id: axisX
+                min: 0
+                max: 10
+            }
+            axisY: CategoryAxis {
+                id: axisY
+                min: 0
+                max: 10
+                startValue: 0
+                CategoryRange {
+                    label: "label0"
+                    endValue: 1
+                }
+                CategoryRange {
+                    label: "label1"
+                    endValue: 3
+                }
+                CategoryRange {
+                    label: "label2"
+                    endValue: 10
+                }
+            }
+            XYPoint { x: -1; y: -1 }
+            XYPoint { x: 0; y: 0 }
+            XYPoint { x: 5; y: 5 }
+        }
+    }
+}
diff --git a/tests/auto/qml-qtquicktest/tst_valueaxis.qml b/tests/auto/qml-qtquicktest/tst_valueaxis.qml
new file mode 100644
index 0000000..8ee58ff
--- /dev/null
+++ b/tests/auto/qml-qtquicktest/tst_valueaxis.qml
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** 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 QtQuickTest 1.0
+import QtCommercial.Chart 1.2
+
+Rectangle {
+    width: 400
+    height: 300
+
+    TestCase {
+        id: tc1
+        name: "tst_qml-qtquicktest ValueAxis"
+        when: windowShown
+
+        function test_defaultPropertyValues() {
+            compare(lineSeries1.axisX.min, 0, "AxisX min");
+            compare(lineSeries1.axisX.max, 10, "AxisX max");
+            compare(lineSeries1.axisY.min, 0, "AxisY min");
+            compare(lineSeries1.axisY.max, 10, "AxisY max");
+            verify(axisX.tickCount > 0, "AxisX tick count");
+            verify(axisY.tickCount > 0, "AxisX tick count");
+            compare(axisX.niceNumbersEnabled, false, "nice numbers");
+            compare(axisX.labelFormat, "", "label format");
+        }
+
+        function test_modifyProperties() {
+            lineSeries1.axisX.tickCount = 3;
+            compare(lineSeries1.axisX.tickCount, 3, "set tick count");
+
+            lineSeries1.axisX.niceNumbersEnabled = true;
+            compare(axisX.niceNumbersEnabled, true, "nice numbers");
+        }
+
+        function test_signals() {
+            axisX.min = 2;
+            compare(minChangedSpy.count, 1, "onMinChanged");
+            compare(maxChangedSpy.count, 0, "onMaxChanged");
+
+            axisX.max = 8;
+            compare(minChangedSpy.count, 1, "onMinChanged");
+            compare(maxChangedSpy.count, 1, "onMaxChanged");
+
+            // restore original values
+            axisX.min = 0;
+            axisX.max = 10;
+            compare(minChangedSpy.count, 2, "onMinChanged");
+            compare(maxChangedSpy.count, 2, "onMaxChanged");
+        }
+    }
+
+    ChartView {
+        id: chartView
+        anchors.fill: parent
+
+        LineSeries {
+            id: lineSeries1
+            axisX: ValueAxis {
+                id: axisX
+                min: 0
+                max: 10
+            }
+            axisY: ValueAxis {
+                id: axisY
+                min: 0
+                max: 10
+            }
+            XYPoint { x: -1; y: -1 }
+            XYPoint { x: 0; y: 0 }
+            XYPoint { x: 5; y: 5 }
+        }
+
+        SignalSpy {
+            id: minChangedSpy
+            target: axisX
+            signalName: "minChanged"
+        }
+        SignalSpy {
+            id: maxChangedSpy
+            target: axisX
+            signalName: "maxChanged"
+        }
+    }
+}
diff --git a/tests/auto/qml-qtquicktest/tst_valuesaxis.qml b/tests/auto/qml-qtquicktest/tst_valueaxis_1_1.qml
similarity index 92%
rename from tests/auto/qml-qtquicktest/tst_valuesaxis.qml
rename to tests/auto/qml-qtquicktest/tst_valueaxis_1_1.qml
index a4ec238..9113f74 100644
--- a/tests/auto/qml-qtquicktest/tst_valuesaxis.qml
+++ b/tests/auto/qml-qtquicktest/tst_valueaxis_1_1.qml
@@ -20,7 +20,7 @@
 
 import QtQuick 1.0
 import QtQuickTest 1.0
-import QtCommercial.Chart 1.2
+import QtCommercial.Chart 1.1
 
 Rectangle {
     width: 400
@@ -28,7 +28,7 @@ Rectangle {
 
     TestCase {
         id: tc1
-        name: "tst_qml-qtquicktest ValuesAxis"
+        name: "tst_qml-qtquicktest ValueAxis 1.1"
         when: windowShown
 
         function test_minMax() {
@@ -45,12 +45,12 @@ Rectangle {
 
         LineSeries {
             id: lineSeries1
-            axisX: ValuesAxis {
+            axisX: ValueAxis {
                 id: axisX
                 min: 0
                 max: 10
             }
-            axisY: ValuesAxis {
+            axisY: ValueAxis {
                 id: axisY
                 min: 0
                 max: 10