Merge branch 'develop'v1.0.0-beta1

Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4

1 files changed, 53 insertions, 0 deletions

diff --git a/src/datavisualization/axis/qcategory3daxis.h b/src/datavisualization/axis/qcategory3daxis.h
new file mode 100644
index 00000000..b16d0444
--- /dev/null
+++ b/src/datavisualization/axis/qcategory3daxis.h
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 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 QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise 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
+**
+****************************************************************************/
+
+#ifndef QCATEGORY3DAXIS_H
+#define QCATEGORY3DAXIS_H
+
+#include <QtDataVisualization/qabstract3daxis.h>
+
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+
+class QCategory3DAxisPrivate;
+
+class QT_DATAVISUALIZATION_EXPORT QCategory3DAxis : public QAbstract3DAxis
+{
+    Q_OBJECT
+    Q_PROPERTY(QStringList labels READ labels WRITE setLabels NOTIFY labelsChanged)
+
+public:
+    explicit QCategory3DAxis(QObject *parent = 0);
+    virtual ~QCategory3DAxis();
+
+    void setLabels(const QStringList &labels);
+    QStringList labels() const;
+
+signals:
+    void labelsChanged();
+
+protected:
+    QCategory3DAxisPrivate *dptr();
+
+private:
+    Q_DISABLE_COPY(QCategory3DAxis)
+    friend class Bars3DController;
+};
+
+QT_END_NAMESPACE_DATAVISUALIZATION
+
+#endif