diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-04 12:46:41 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-04 13:04:35 +0300 |
| commit | 8122450d4f17781a35ec595c846e05c4c1af394c (patch) | |
| tree | 9b5711f08f419d1b9ae2393c7e8e49cdd4834eab /src/datavis3dqml2/datavis3dqml2_plugin.h | |
| parent | 4d453a939850638fa17b44b91d10b31acde10acd (diff) | |
Rename axes to avoid conflicts with Charts
+ Some doc fixes.
Task-number: QTRD-2214
Change-Id: Idecec749a76ef6a5d84857d1396f25be3ef017ca
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavis3dqml2/datavis3dqml2_plugin.h')
| -rw-r--r-- | src/datavis3dqml2/datavis3dqml2_plugin.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/datavis3dqml2/datavis3dqml2_plugin.h b/src/datavis3dqml2/datavis3dqml2_plugin.h index aaa3add9..35bd8840 100644 --- a/src/datavis3dqml2/datavis3dqml2_plugin.h +++ b/src/datavis3dqml2/datavis3dqml2_plugin.h @@ -24,8 +24,8 @@ #include "declarativescatter_p.h" #include "qitemmodelbardatamapping.h" #include "qitemmodelscatterdatamapping.h" -#include "qvalueaxis.h" -#include "qcategoryaxis.h" +#include "q3dvalueaxis.h" +#include "q3dcategoryaxis.h" #include <QQmlExtensionPlugin> @@ -39,9 +39,9 @@ Q_DECLARE_METATYPE(QItemModelScatterDataMapping *) Q_DECLARE_METATYPE(const QAbstractItemModel *) Q_DECLARE_METATYPE(QDataVis *) -Q_DECLARE_METATYPE(QAbstractAxis *) -Q_DECLARE_METATYPE(QCategoryAxis *) -Q_DECLARE_METATYPE(QValueAxis *) +Q_DECLARE_METATYPE(Q3DAbstractAxis *) +Q_DECLARE_METATYPE(Q3DCategoryAxis *) +Q_DECLARE_METATYPE(Q3DValueAxis *) QT_DATAVIS3D_BEGIN_NAMESPACE |