diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-09 15:52:53 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-10 08:20:59 +0300 |
| commit | f15bcc41a2be8aa2267f4abf23e99bac72b594b4 (patch) | |
| tree | 771fd956942b19054a2fa635a4d6d8741e54fdaa /src/datavisualization/engine | |
| parent | e9dc0f74f5cc06eb5edc3c16a63c9e6e89422584 (diff) | |
Fix selectedElement qmldesigner crash
Also fix some minor inconsistencies in the API.
Change-Id: Ia31321a1f70d132173a909fef68fd3b59e06e080
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine')
| -rw-r--r-- | src/datavisualization/engine/abstract3dcontroller.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index 8658d463..30434dca 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -1481,7 +1481,10 @@ QCustom3DItem *Abstract3DController::selectedCustomItem() const QAbstract3DGraph::ElementType Abstract3DController::selectedElement() const { - return m_renderer->clickedType(); + if (m_renderer) + return m_renderer->clickedType(); + else + return QAbstract3DGraph::ElementNone; } void Abstract3DController::setOrthoProjection(bool enable) |