Merge branch 'develop'

Change-Id: I55a342465fa2ddb6db14056f4a991bdc1d4ef8ce

2 files changed, 2 insertions, 2 deletions

diff --git a/examples/datavisualization/texturesurface/highlightseries.h b/examples/datavisualization/texturesurface/highlightseries.h
index 43fe704a..701204ce 100644
--- a/examples/datavisualization/texturesurface/highlightseries.h
+++ b/examples/datavisualization/texturesurface/highlightseries.h
@@ -35,7 +35,7 @@ public:
     void setTopographicSeries(TopographicSeries *series);
     inline void setMinHeight(float height) { m_minHeight = height; }
 
-public slots:
+public Q_SLOTS:
     void handlePositionChange(const QPoint &position);
     void handleGradientChange(float value);
 
diff --git a/examples/datavisualization/texturesurface/topographicseries.h b/examples/datavisualization/texturesurface/topographicseries.h
index 206e60aa..b77e8ebf 100644
--- a/examples/datavisualization/texturesurface/topographicseries.h
+++ b/examples/datavisualization/texturesurface/topographicseries.h
@@ -35,7 +35,7 @@ public:
     float sampleCountX() { return m_sampleCountX; }
     float sampleCountZ() { return m_sampleCountZ; }
 
-public slots:
+public Q_SLOTS:
 
 private:
     float m_sampleCountX;