summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-09-20 09:58:22 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-09-20 10:01:25 +0300
commitd8662133def955c4aedf83e9b035fbece35a6710 (patch)
tree17400fb99e06ff5fef1029e1a47c5bbfc58da2cc /src/datavisualizationqml2
parent61f323fde93cf105fb2c70c74cf756211e5aba4f (diff)
Surface: Implemented giving a height map via API
Task-number: QTRD-2273 Change-Id: Ib0c540d52711ced38421b744664de7eddd97b585 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2_plugin.cpp1
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2_plugin.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
index 83c9eaf8..3a700d1d 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
@@ -54,6 +54,7 @@ void Datavis3Dqml2Plugin::registerTypes(const char *uri)
qmlRegisterType<QItemModelBarDataProxy>(uri, 1, 0, "ItemModelBarDataProxy");
qmlRegisterType<QItemModelScatterDataProxy>(uri, 1, 0, "ItemModelScatterDataProxy");
qmlRegisterType<QItemModelSurfaceDataProxy>(uri, 1, 0, "ItemModelSurfaceDataProxy");
+ qmlRegisterType<QHeightMapSurfaceDataProxy>(uri, 1, 0, "HeightMapSurfaceDataProxy");
}
QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
index 543afb9c..530b8fd2 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
@@ -29,6 +29,7 @@
#include "qitemmodelbardataproxy.h"
#include "qitemmodelscatterdataproxy.h"
#include "qitemmodelsurfacedataproxy.h"
+#include "qheightmapsurfacedataproxy.h"
#include "q3dvalueaxis.h"
#include "q3dcategoryaxis.h"
@@ -59,6 +60,7 @@ Q_DECLARE_METATYPE(QScatterDataProxy *)
Q_DECLARE_METATYPE(QItemModelScatterDataProxy *)
Q_DECLARE_METATYPE(QSurfaceDataProxy *)
Q_DECLARE_METATYPE(QItemModelSurfaceDataProxy *)
+Q_DECLARE_METATYPE(QHeightMapSurfaceDataProxy *)
QT_DATAVISUALIZATION_BEGIN_NAMESPACE