Merge branch 'develop'v1.0.0-beta1

Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4

1 files changed, 0 insertions, 53 deletions

diff --git a/src/datavisualization/axis/q3dcategoryaxis.h b/src/datavisualization/axis/q3dcategoryaxis.h
deleted file mode 100644
index 7b2b4744..00000000
--- a/src/datavisualization/axis/q3dcategoryaxis.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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 Q3DCATEGORYAXIS_H
-#define Q3DCATEGORYAXIS_H
-
-#include <QtDataVisualization/q3dabstractaxis.h>
-
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
-
-class Q3DCategoryAxisPrivate;
-
-class QT_DATAVISUALIZATION_EXPORT Q3DCategoryAxis : public Q3DAbstractAxis
-{
-    Q_OBJECT
-    Q_PROPERTY(QStringList labels READ labels WRITE setLabels NOTIFY labelsChanged)
-
-public:
-    explicit Q3DCategoryAxis(QObject *parent = 0);
-    virtual ~Q3DCategoryAxis();
-
-    void setLabels(const QStringList &labels);
-    QStringList labels() const;
-
-signals:
-    void labelsChanged();
-
-protected:
-    Q3DCategoryAxisPrivate *dptr();
-
-private:
-    Q_DISABLE_COPY(Q3DCategoryAxis)
-    friend class Bars3DController;
-};
-
-QT_DATAVISUALIZATION_END_NAMESPACE
-
-#endif // QCATEGORYAXIS_H