diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-09-14 10:47:08 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-09-14 11:11:51 +0300 |
| commit | d1e65f10217f51f81935df90129f82217d3648ed (patch) | |
| tree | d9c37ee021008b497609816045d91f6cdde09231 /src/datavisualization/data/qsurfacedataitem.h | |
| parent | 5ba7f70d0d94de720d49b37b2d257b51b9afd026 (diff) | |
| parent | dc6dcf918bcf4f350ab92ab659506b4a0f8d80f6 (diff) | |
Merge branch 'develop'
Change-Id: I55a342465fa2ddb6db14056f4a991bdc1d4ef8ce
Diffstat (limited to 'src/datavisualization/data/qsurfacedataitem.h')
| -rw-r--r-- | src/datavisualization/data/qsurfacedataitem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/datavisualization/data/qsurfacedataitem.h b/src/datavisualization/data/qsurfacedataitem.h index 33ecc7aa..972d3e17 100644 --- a/src/datavisualization/data/qsurfacedataitem.h +++ b/src/datavisualization/data/qsurfacedataitem.h @@ -36,7 +36,7 @@ public: QSurfaceDataItem &operator=(const QSurfaceDataItem &other); - inline void setPosition(const QVector3D &position) { m_position = position; } + inline void setPosition(const QVector3D &pos) { m_position = pos; } inline QVector3D position() const { return m_position; } inline void setX(float value) { m_position.setX(value); } inline void setY(float value) { m_position.setY(value); } |