diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-02 12:34:43 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-02 12:38:39 +0300 |
commit | 7f505c5b6c1a613ffad90fb4d90ff81071cb6236 (patch) | |
tree | 66c31f9079e5dc8a9bdd0613d1f3fb7a5904ec67 /src/datavisualization/data/qitemmodelscatterdataproxy.h | |
parent | 6a36592a1df28b523cfaf1b6359970273efb6e53 (diff) |
Fix QML item model crashes
Needed to allow using charts and data visualization from the
same application.
Low-impact binary break
Change-Id: I4b82e540b202e18e2e7a4278d06c9e9f43001a8f
Change-Id: I4b82e540b202e18e2e7a4278d06c9e9f43001a8f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/data/qitemmodelscatterdataproxy.h')
-rw-r--r-- | src/datavisualization/data/qitemmodelscatterdataproxy.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h index 5c2bbce9..3215c688 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.h +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h @@ -31,7 +31,7 @@ class QItemModelScatterDataProxyPrivate; class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy { Q_OBJECT - Q_PROPERTY(const QAbstractItemModel* itemModel READ itemModel WRITE setItemModel NOTIFY itemModelChanged) + Q_PROPERTY(QAbstractItemModel* itemModel READ itemModel WRITE setItemModel NOTIFY itemModelChanged) Q_PROPERTY(QString xPosRole READ xPosRole WRITE setXPosRole NOTIFY xPosRoleChanged) Q_PROPERTY(QString yPosRole READ yPosRole WRITE setYPosRole NOTIFY yPosRoleChanged) Q_PROPERTY(QString zPosRole READ zPosRole WRITE setZPosRole NOTIFY zPosRoleChanged) @@ -47,18 +47,18 @@ class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDa public: explicit QItemModelScatterDataProxy(QObject *parent = 0); - QItemModelScatterDataProxy(const QAbstractItemModel *itemModel, QObject *parent = 0); - QItemModelScatterDataProxy(const QAbstractItemModel *itemModel, + QItemModelScatterDataProxy(QAbstractItemModel *itemModel, QObject *parent = 0); + QItemModelScatterDataProxy(QAbstractItemModel *itemModel, const QString &xPosRole, const QString &yPosRole, const QString &zPosRole, QObject *parent = 0); - QItemModelScatterDataProxy(const QAbstractItemModel *itemModel, + QItemModelScatterDataProxy(QAbstractItemModel *itemModel, const QString &xPosRole, const QString &yPosRole, const QString &zPosRole, const QString &rotationRole, QObject *parent = 0); virtual ~QItemModelScatterDataProxy(); - void setItemModel(const QAbstractItemModel *itemModel); - const QAbstractItemModel *itemModel() const; + void setItemModel(QAbstractItemModel *itemModel); + QAbstractItemModel *itemModel() const; void setXPosRole(const QString &role); QString xPosRole() const; |