diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-29 11:23:49 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-29 13:54:06 +0200 |
| commit | a7273a8f86d8f67afb9b9693b0a0be0ae030c8a6 (patch) | |
| tree | 2825bf061702b879ffb98cc16f33bd98b372501d | |
| parent | 527113321ff103835b89543c5d6f670f55b5b0d5 (diff) | |
Fix some QML warnings and errors
- Added NOTIFY to scene property to remove the warning in QML
- Correct use of mesh in qmldynamicdata test
Change-Id: If9a8c32ab9c873153379192859c5ce89e9a15d99
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 3 | ||||
| -rw-r--r-- | tests/qmldynamicdata/qml/qmldynamicdata/main.qml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 7811a44e..fd7d89f2 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -44,7 +44,7 @@ class AbstractDeclarative : public QQuickItem Q_OBJECT Q_PROPERTY(QtDataVisualization::QDataVis::SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged) Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged) - Q_PROPERTY(Q3DScene* scene READ scene) + Q_PROPERTY(Q3DScene* scene READ scene NOTIFY sceneChanged) Q_PROPERTY(QAbstract3DInputHandler* inputHandler READ inputHandler WRITE setInputHandler NOTIFY inputHandlerChanged) Q_PROPERTY(Q3DTheme* theme READ theme WRITE setTheme NOTIFY themeChanged) @@ -83,6 +83,7 @@ signals: void themeChanged(Q3DTheme *theme); void selectionModeChanged(QDataVis::SelectionFlags mode); void itemLabelFormatChanged(QString format); + void sceneChanged(Q3DScene *scene); private: Abstract3DController *m_controller; diff --git a/tests/qmldynamicdata/qml/qmldynamicdata/main.qml b/tests/qmldynamicdata/qml/qmldynamicdata/main.qml index d987f1e8..7453606a 100644 --- a/tests/qmldynamicdata/qml/qmldynamicdata/main.qml +++ b/tests/qmldynamicdata/qml/qmldynamicdata/main.qml @@ -71,12 +71,12 @@ Item { theme: Theme3D { type: AbstractGraph3D.ThemeDigia } shadowQuality: AbstractGraph3D.ShadowQualitySoftMedium scene.activeCamera.yRotation: 30.0 - objectType: AbstractGraph3D.MeshStyleCubes inputHandler: null Scatter3DSeries { id: scatterSeries itemLabelFormat: "X:@xLabel Y:@yLabel Z:@zLabel" + mesh: Abstract3DSeries.MeshCube ItemModelScatterDataProxy { itemModel: graphModel |