diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-23 09:03:00 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-23 09:25:49 +0200 |
| commit | db4fa86cffefbc34b8da7961103ac97424ff41e9 (patch) | |
| tree | f83ce363dcf06b3020a215484a7b6e779944b8e5 /src/datavisualizationqml2/abstractdeclarative.cpp | |
| parent | 0237941e81d9f6713170c67a8dec6113fec1ef01 (diff) | |
Add example for showing graph legend
+Fix default theme
Task-number: QTRD-2653
Change-Id: Iccf4161cd19a9dfe6226189568efeb4565ba53ed
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/abstractdeclarative.cpp')
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index e573b6f2..d04301cf 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -18,6 +18,7 @@ #include "abstractdeclarative_p.h" #include "qvalue3daxis.h" +#include "declarativetheme_p.h" #include <QThread> #include <QGuiApplication> @@ -99,6 +100,13 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller) { Q_ASSERT(controller); m_controller = controller; + + // Reset default theme, as the default C++ theme is Q3DTheme, not DeclarativeTheme3D. + DeclarativeTheme3D *defaultTheme = new DeclarativeTheme3D; + defaultTheme->d_ptr->setDefaultTheme(true); + defaultTheme->setType(Q3DTheme::ThemeQt); + m_controller->setActiveTheme(defaultTheme); + QObject::connect(m_controller, &Abstract3DController::shadowQualityChanged, this, &AbstractDeclarative::handleShadowQualityChange); QObject::connect(m_controller, &Abstract3DController::activeInputHandlerChanged, this, |