diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-20 10:56:59 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-07 08:10:13 +0200 |
| commit | aa842c39480aa5b95f704c97b8b3acc821144883 (patch) | |
| tree | 8a1e90e1fe1d6d85054286e655cb2e1722d758eb /src/datavisualizationqml2 | |
| parent | 91a94a743b4cfd30ef77aa73837050d44620469b (diff) | |
Fix theme ownership
Theme ownership now uses similar model as axis and inputhandler
ownership: Graph can own multiple themes, but only one is active
at the time.
Task-number: QTRD-2623
Change-Id: I7134384df6f8cc465cc28fbebb454b7d2e254f83
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 587ea879..b9f26938 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -43,12 +43,12 @@ Q3DScene* AbstractDeclarative::scene() const void AbstractDeclarative::setTheme(Q3DTheme *theme) { - m_controller->setTheme(theme); + m_controller->setActiveTheme(theme); } Q3DTheme *AbstractDeclarative::theme() const { - return m_controller->theme(); + return m_controller->activeTheme(); } void AbstractDeclarative::setSelectionMode(QDataVis::SelectionFlags mode) @@ -79,7 +79,7 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller) &AbstractDeclarative::shadowQualityChanged); QObject::connect(m_controller, &Abstract3DController::activeInputHandlerChanged, this, &AbstractDeclarative::inputHandlerChanged); - QObject::connect(m_controller, &Abstract3DController::themeChanged, this, + QObject::connect(m_controller, &Abstract3DController::activeThemeChanged, this, &AbstractDeclarative::themeChanged); QObject::connect(m_controller, &Abstract3DController::selectionModeChanged, this, &AbstractDeclarative::selectionModeChanged); |