summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-11-13 09:48:51 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-11-13 09:52:04 +0200
commitfbde3692cc63fe2d8b2f5b2b42226c110a354fc7 (patch)
tree3085e9cf8a458d4010e88dec4da260081fa42be1 /src
parentd0d0ee40e85e9af4dcf36dcf0af3035daaf5ea82 (diff)
Default theme fixed
Task-number: QTRD-2559 Change-Id: Iadfdef6f06fef4fd9180b0864f6b1b745605363f Change-Id: Iadfdef6f06fef4fd9180b0864f6b1b745605363f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/datavisualization/engine/abstract3dcontroller.cpp3
-rw-r--r--src/datavisualization/engine/theme.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 079efd21..ab2d0ac2 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -53,7 +53,8 @@ Abstract3DController::Abstract3DController(QRect boundRect, QObject *parent) :
m_data(0),
m_renderPending(false)
{
- m_theme.useTheme(QDataVis::ThemeQt);
+ // Set initial theme
+ setTheme(QDataVis::ThemeQt);
// Populate the scene
m_scene->activeLight()->setPosition(defaultLightPos);
diff --git a/src/datavisualization/engine/theme.cpp b/src/datavisualization/engine/theme.cpp
index 5c67071c..48685dc4 100644
--- a/src/datavisualization/engine/theme.cpp
+++ b/src/datavisualization/engine/theme.cpp
@@ -26,7 +26,8 @@
QT_DATAVISUALIZATION_BEGIN_NAMESPACE
Theme::Theme()
- : m_baseColor(QColor(Qt::gray)),
+ : m_theme(QDataVis::ThemeDefault),
+ m_baseColor(QColor(Qt::gray)),
m_heightColor(QColor(Qt::black)),
m_depthColor(QColor(Qt::black)),
m_backgroundColor(QColor(Qt::gray)),