diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:00:24 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:03:16 +0300 |
commit | cfbfbea7d932f98c3f541bb4fc3e975ffb7a5658 (patch) | |
tree | bed376368e9611c751cf1dd75b85de2827d67325 /examples/datavisualization/rotations/scatterdatamodifier.h | |
parent | 8435c15d224a4e9db0920ecd33c4bea3e70d83bf (diff) | |
parent | c51e0f83ef6dd9e85db6953995585ba0cafb35d7 (diff) |
Merge branch 'develop'
Change-Id: I3d06158cec5e54f69ff3d0606b7d1dfe1a8a2f70
Diffstat (limited to 'examples/datavisualization/rotations/scatterdatamodifier.h')
-rw-r--r-- | examples/datavisualization/rotations/scatterdatamodifier.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/datavisualization/rotations/scatterdatamodifier.h b/examples/datavisualization/rotations/scatterdatamodifier.h index 9df1f26a..c4f7e7a4 100644 --- a/examples/datavisualization/rotations/scatterdatamodifier.h +++ b/examples/datavisualization/rotations/scatterdatamodifier.h @@ -47,7 +47,7 @@ private: int m_fieldLines; int m_arrowsPerLine; QScatter3DSeries *m_magneticField; - QScatter3DSeries *m_sun; + QCustom3DItem *m_sun; QScatterDataArray *m_magneticFieldArray; float m_angleOffset; float m_angleStep; |