diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-03-17 08:12:43 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-03-17 08:16:59 +0200 |
commit | dd9f4f1363da85528a62c12616359416e8a1f6c0 (patch) | |
tree | d192bb80962b28795d2c5afaa05b73fc1be25420 /src/datavisualizationqml2/abstractdeclarative_p.h | |
parent | 839e357c1433e74a5bf65a892134a08d7e8f71bc (diff) | |
parent | 389a29326efc298fd75899a45a0dc768b27152d5 (diff) |
Merge branch 'develop'
Change-Id: I0c507ac2c87de5b25a2f918523e1b12942264d8b
Diffstat (limited to 'src/datavisualizationqml2/abstractdeclarative_p.h')
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 0a18dc25..87b108db 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -159,14 +159,14 @@ protected: virtual QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *); signals: - void selectionModeChanged(SelectionFlags mode); - void shadowQualityChanged(ShadowQuality quality); + void selectionModeChanged(AbstractDeclarative::SelectionFlags mode); + void shadowQualityChanged(AbstractDeclarative::ShadowQuality quality); void shadowsSupportedChanged(bool supported); void msaaSamplesChanged(int samples); void sceneChanged(Q3DScene *scene); void inputHandlerChanged(QAbstract3DInputHandler *inputHandler); void themeChanged(Q3DTheme *theme); - void renderingModeChanged(RenderingMode mode); + void renderingModeChanged(AbstractDeclarative::RenderingMode mode); private: QPointer<Abstract3DController> m_controller; |