Merge branch 'develop'

Change-Id: I0c507ac2c87de5b25a2f918523e1b12942264d8b

1 files changed, 2 insertions, 2 deletions

diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h
index 43278c79..3a82afea 100644
--- a/src/datavisualization/theme/q3dtheme.h
+++ b/src/datavisualization/theme/q3dtheme.h
@@ -148,7 +148,7 @@ public:
     ColorStyle colorStyle() const;
 
 signals:
-    void typeChanged(Theme themeType);
+    void typeChanged(Q3DTheme::Theme themeType);
     void baseColorsChanged(const QList<QColor> &colors);
     void backgroundColorChanged(const QColor &color);
     void windowColorChanged(const QColor &color);
@@ -169,7 +169,7 @@ signals:
     void backgroundEnabledChanged(bool enabled);
     void gridEnabledChanged(bool enabled);
     void labelBackgroundEnabledChanged(bool enabled);
-    void colorStyleChanged(ColorStyle style);
+    void colorStyleChanged(Q3DTheme::ColorStyle style);
 
 protected:
     explicit Q3DTheme(Q3DThemePrivate *d, Theme themeType, QObject *parent = 0);