Fix building against 5.6

Apparently Qt modules are now required to use Q_SIGNALS and Q_SLOTS
macros instead of 'signals' and 'slots' in headers.

Change-Id: I4140b1fff4386d74bb371176919234366965e887
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>

13 files changed, 17 insertions, 17 deletions

diff --git a/examples/datavisualization/bars/graphmodifier.h b/examples/datavisualization/bars/graphmodifier.h
index 775f4573..d9a22855 100644
--- a/examples/datavisualization/bars/graphmodifier.h
+++ b/examples/datavisualization/bars/graphmodifier.h
@@ -52,7 +52,7 @@ public:
     void setReverseValueAxis(int enabled);
     void setReflection(bool enabled);
 
-public slots:
+public Q_SLOTS:
     void changeRange(int range);
     void changeStyle(int style);
     void changeSelectionMode(int selectionMode);
@@ -64,7 +64,7 @@ public slots:
     void setAxisTitleFixed(bool enabled);
     void zoomToSelectedBar();
 
-signals:
+Q_SIGNALS:
     void shadowQualityChanged(int quality);
     void backgroundEnabledChanged(bool enabled);
     void gridEnabledChanged(bool enabled);
diff --git a/examples/datavisualization/custominput/scatterdatamodifier.h b/examples/datavisualization/custominput/scatterdatamodifier.h
index 5aafbdeb..b1181a38 100644
--- a/examples/datavisualization/custominput/scatterdatamodifier.h
+++ b/examples/datavisualization/custominput/scatterdatamodifier.h
@@ -41,12 +41,12 @@ public:
     void toggleCameraAnimation();
     void start();
 
-public slots:
+public Q_SLOTS:
     void changeShadowQuality(int quality);
     void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality);
     void triggerSelection();
 
-signals:
+Q_SIGNALS:
     void shadowQualityChanged(int quality);
 
 private:
diff --git a/examples/datavisualization/customproxy/variantbardatamapping.h b/examples/datavisualization/customproxy/variantbardatamapping.h
index 0c300709..024e7ffc 100644
--- a/examples/datavisualization/customproxy/variantbardatamapping.h
+++ b/examples/datavisualization/customproxy/variantbardatamapping.h
@@ -61,7 +61,7 @@ public:
                const QStringList &rowCategories,
                const QStringList &columnCategories);
     //! [2]
-signals:
+Q_SIGNALS:
     //! [3]
     void mappingChanged();
     //! [3]
diff --git a/examples/datavisualization/customproxy/variantbardataproxy.h b/examples/datavisualization/customproxy/variantbardataproxy.h
index afaa70d1..62a14bee 100644
--- a/examples/datavisualization/customproxy/variantbardataproxy.h
+++ b/examples/datavisualization/customproxy/variantbardataproxy.h
@@ -51,7 +51,7 @@ public:
     VariantBarDataMapping *mapping();
     //! [1]
 
-public slots:
+public Q_SLOTS:
     void handleItemsAdded(int index, int count);
     void handleDataCleared();
     void handleMappingChanged();
diff --git a/examples/datavisualization/customproxy/variantdataset.h b/examples/datavisualization/customproxy/variantdataset.h
index 78aa6170..1ee74965 100644
--- a/examples/datavisualization/customproxy/variantdataset.h
+++ b/examples/datavisualization/customproxy/variantdataset.h
@@ -43,7 +43,7 @@ public:
 
     const VariantDataItemList &itemList() const;
 
-signals:
+Q_SIGNALS:
     void itemsAdded(int index, int count);
     void dataCleared();
     //! [0]
diff --git a/examples/datavisualization/qmlaxisformatter/customformatter.h b/examples/datavisualization/qmlaxisformatter/customformatter.h
index 62eac218..2e5817fd 100644
--- a/examples/datavisualization/qmlaxisformatter/customformatter.h
+++ b/examples/datavisualization/qmlaxisformatter/customformatter.h
@@ -51,11 +51,11 @@ public:
     QDate originDate() const;
     QString selectionFormat() const;
 
-public slots:
+public Q_SLOTS:
     void setOriginDate(const QDate &date);
     void setSelectionFormat(const QString &format);
 
-signals:
+Q_SIGNALS:
     void originDateChanged(const QDate &date);
     void selectionFormatChanged(const QString &format);
 
diff --git a/examples/datavisualization/qmloscilloscope/datasource.h b/examples/datavisualization/qmloscilloscope/datasource.h
index 03dcc510..667c78aa 100644
--- a/examples/datavisualization/qmloscilloscope/datasource.h
+++ b/examples/datavisualization/qmloscilloscope/datasource.h
@@ -31,7 +31,7 @@ public:
     virtual ~DataSource();
 
     //! [0]
-public slots:
+public Q_SLOTS:
     void generateData(int cacheCount, int rowCount, int columnCount,
                       float xMin, float xMax, float yMin, float yMax, float zMin, float zMax);
 
diff --git a/examples/datavisualization/rotations/scatterdatamodifier.h b/examples/datavisualization/rotations/scatterdatamodifier.h
index a876a419..23c6f3df 100644
--- a/examples/datavisualization/rotations/scatterdatamodifier.h
+++ b/examples/datavisualization/rotations/scatterdatamodifier.h
@@ -34,7 +34,7 @@ public:
 
     void generateData();
 
-public slots:
+public Q_SLOTS:
     void setFieldLines(int lines);
     void setArrowsPerLine(int arrows);
     void toggleRotation();
diff --git a/examples/datavisualization/scatter/scatterdatamodifier.h b/examples/datavisualization/scatter/scatterdatamodifier.h
index 867ed821..2c9ca1db 100644
--- a/examples/datavisualization/scatter/scatterdatamodifier.h
+++ b/examples/datavisualization/scatter/scatterdatamodifier.h
@@ -44,13 +44,13 @@ public:
     void toggleItemCount();
     void start();
 
-public slots:
+public Q_SLOTS:
     void changeStyle(int style);
     void changeTheme(int theme);
     void changeShadowQuality(int quality);
     void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality);
 
-signals:
+Q_SIGNALS:
     void backgroundEnabledChanged(bool enabled);
     void gridEnabledChanged(bool enabled);
     void shadowQualityChanged(int quality);
diff --git a/examples/datavisualization/surface/surfacegraph.h b/examples/datavisualization/surface/surfacegraph.h
index 34eb373a..d59a59a1 100644
--- a/examples/datavisualization/surface/surfacegraph.h
+++ b/examples/datavisualization/surface/surfacegraph.h
@@ -59,7 +59,7 @@ public:
     void adjustZMin(int min);
     void adjustZMax(int max);
 
-public slots:
+public Q_SLOTS:
     void changeTheme(int theme);
 
 private:
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;
diff --git a/examples/datavisualization/volumetric/volumetric.h b/examples/datavisualization/volumetric/volumetric.h
index 1edd4cb9..58cd973e 100644
--- a/examples/datavisualization/volumetric/volumetric.h
+++ b/examples/datavisualization/volumetric/volumetric.h
@@ -43,7 +43,7 @@ public:
     void setSliceLabels(QLabel *xLabel, QLabel *yLabel, QLabel *zLabel);
     void setAlphaMultiplierLabel(QLabel *label);
 
-public slots:
+public Q_SLOTS:
     void sliceX(int enabled);
     void sliceY(int enabled);
     void sliceZ(int enabled);