diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-05-28 13:52:16 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-05-28 13:54:50 +0300 |
| commit | 62bcc7affd7ca0cda298f1e373c441e6b2cde53c (patch) | |
| tree | 072f4e731a7791758cc22175171d540a773b603a /src | |
| parent | f1d7a4679711734b74538be649567d0826278920 (diff) | |
Fixed crash whe mixing charts and datavis
Task-number: QTRD-3142
Change-Id: Ic12253cb4ea63cb6a81a9d363a43982690fa33ae
Change-Id: Ic12253cb4ea63cb6a81a9d363a43982690fa33ae
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavisualizationqml2/datavisualizationqml2_plugin.cpp | 4 | ||||
| -rw-r--r-- | src/datavisualizationqml2/datavisualizationqml2_plugin.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp index 6893a286..09780dc5 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp @@ -28,8 +28,8 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri) // QtDataVisualization 1.0 - qmlRegisterUncreatableType<const QAbstractItemModel>(uri, 1, 0, "AbstractItemModel", - QLatin1String("Trying to create uncreatable: AbstractItemModel.")); + qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel", + QLatin1String("Trying to create uncreatable: AbstractItemModel.")); qmlRegisterUncreatableType<QAbstract3DAxis>(uri, 1, 0, "AbstractAxis3D", QLatin1String("Trying to create uncreatable: AbstractAxis.")); qmlRegisterUncreatableType<QAbstractDataProxy>(uri, 1, 0, "AbstractDataProxy", diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h index 1e566ac1..21ef85b8 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h @@ -57,7 +57,7 @@ QML_DECLARE_TYPE(DeclarativeBars) QML_DECLARE_TYPE(DeclarativeScatter) QML_DECLARE_TYPE(DeclarativeSurface) -QML_DECLARE_TYPE(const QAbstractItemModel) +QML_DECLARE_TYPE(QAbstractItemModel) QML_DECLARE_TYPE(QAbstract3DAxis) QML_DECLARE_TYPE(QCategory3DAxis) |