summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-12-05 11:26:25 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-12-05 12:00:39 +0200
commita665bdb2010c3833f47d364945007cccc00aed2b (patch)
treeb364646695ccf068d409c785a10531e04f3c261d /src/datavisualizationqml2
parente57ed8602ac02ff86e3c08362ca4fbe23fe05bfb (diff)
QML docs + enum moving
Task-number: QTRD-2670 Task-number: QTRD-2505 Change-Id: I51a870f9a57b093e8216759a5577e161ff3afd60 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2_plugin.cpp3
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2_plugin.h5
2 files changed, 8 insertions, 0 deletions
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
index 4dd095f8..2ca23643 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
@@ -53,6 +53,8 @@ void Datavis3Dqml2Plugin::registerTypes(const char *uri)
QLatin1String("Trying to create uncreatable: QSurface3DSeries, use Surface3DSeries instead."));
qmlRegisterUncreatableType<Q3DTheme>(uri, 1, 0, "Q3DTheme",
QLatin1String("Trying to create uncreatable: Q3DTheme, use Theme3D instead."));
+ qmlRegisterUncreatableType<QAbstract3DInputHandler>(uri, 1, 0, "AbstractInputHandler3D",
+ QLatin1String("Trying to create uncreatable: AbstractInputHandler3D."));
qmlRegisterType<DeclarativeBars>(uri, 1, 0, "Bars3D");
qmlRegisterType<DeclarativeScatter>(uri, 1, 0, "Scatter3D");
@@ -62,6 +64,7 @@ void Datavis3Dqml2Plugin::registerTypes(const char *uri)
qmlRegisterType<Q3DCategoryAxis>(uri, 1, 0, "CategoryAxis3D");
qmlRegisterType<Q3DCamera>(uri, 1, 0, "Camera3D");
+ qmlRegisterType<Q3DLight>(uri, 1, 0, "Light3D");
qmlRegisterType<QItemModelBarDataProxy>(uri, 1, 0, "ItemModelBarDataProxy");
qmlRegisterType<QItemModelScatterDataProxy>(uri, 1, 0, "ItemModelScatterDataProxy");
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
index b640296b..7a30d65d 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
@@ -32,6 +32,7 @@
#include "q3dobject.h"
#include "q3dcamera.h"
#include "q3dscene.h"
+#include "q3dlight.h"
#include "qabstract3dseries.h"
#include "qbar3dseries.h"
#include "qscatter3dseries.h"
@@ -39,6 +40,7 @@
#include "declarativeseries_p.h"
#include "q3dtheme.h"
#include "declarativetheme_p.h"
+#include "qabstract3dinputhandler.h"
#include <QQmlExtensionPlugin>
@@ -59,6 +61,7 @@ QML_DECLARE_TYPE(Q3DValueAxis)
QML_DECLARE_TYPE(Q3DScene)
QML_DECLARE_TYPE(Q3DObject)
QML_DECLARE_TYPE(Q3DCamera)
+QML_DECLARE_TYPE(Q3DLight)
QML_DECLARE_TYPE(QAbstractDataProxy)
QML_DECLARE_TYPE(QBarDataProxy)
@@ -83,6 +86,8 @@ QML_DECLARE_TYPE(ColorGradient)
QML_DECLARE_TYPE(Q3DTheme)
QML_DECLARE_TYPE(DeclarativeTheme3D)
+QML_DECLARE_TYPE(QAbstract3DInputHandler)
+
QT_DATAVISUALIZATION_BEGIN_NAMESPACE
class Datavis3Dqml2Plugin : public QQmlExtensionPlugin