summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-01-27 11:17:01 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-01-27 11:30:29 +0200
commit31d0b8bb9b8bc1afd9ec0766651f122420cda933 (patch)
tree1ac4f5355c16f504cbb63e42bf9a8236182c4a2d /src
parent27e56759c1210a36abb2877afd9d9d70ba058281 (diff)
Valground beta
Change-Id: I05867a256caea389fb1d2c19bccbf244732343a2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/datavisualization/data/qabstractdataproxy.cpp2
-rw-r--r--src/datavisualization/engine/bars3dcontroller.cpp1
-rw-r--r--src/datavisualization/engine/surface3drenderer.cpp1
3 files changed, 3 insertions, 1 deletions
diff --git a/src/datavisualization/data/qabstractdataproxy.cpp b/src/datavisualization/data/qabstractdataproxy.cpp
index 9870dfbe..18d88971 100644
--- a/src/datavisualization/data/qabstractdataproxy.cpp
+++ b/src/datavisualization/data/qabstractdataproxy.cpp
@@ -110,7 +110,7 @@ QAbstractDataProxyPrivate::~QAbstractDataProxyPrivate()
void QAbstractDataProxyPrivate::setSeries(QAbstract3DSeries *series)
{
- setParent(series);
+ q_ptr->setParent(series);
m_series = series;
}
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index 54a57114..5bd37ccf 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -37,6 +37,7 @@ Bars3DController::Bars3DController(QRect boundRect, Q3DScene *scene)
m_selectedBar(invalidSelectionPosition()),
m_selectedBarSeries(0),
m_primarySeries(0),
+ m_isMultiSeriesUniform(false),
m_isBarSpecRelative(true),
m_barThicknessRatio(1.0f),
m_barSpacing(QSizeF(1.0, 1.0)),
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index 4846870a..82f9eae1 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -86,6 +86,7 @@ Surface3DRenderer::Surface3DRenderer(Surface3DController *controller)
m_surfaceObj(0),
m_sliceSurfaceObj(0),
m_depthTexture(0),
+ m_depthModelTexture(0),
m_depthFrameBuffer(0),
m_selectionFrameBuffer(0),
m_selectionDepthBuffer(0),