Fix build against 5.6

Took Q_SIGNALS and Q_SLOTS macros into use where required.
Fixed chartsnamespace.h header for regular builds.

Task-number: QTRD-3609
Change-Id: I4bae1b88829105b60c8c1cf3b2e109da955f2328
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

11 files changed, 13 insertions, 10 deletions

diff --git a/examples/charts/qmloscilloscope/datasource.h b/examples/charts/qmloscilloscope/datasource.h
index d368bdca..84548e8b 100644
--- a/examples/charts/qmloscilloscope/datasource.h
+++ b/examples/charts/qmloscilloscope/datasource.h
@@ -34,7 +34,7 @@ class DataSource : public QObject
 public:
     explicit DataSource(QQuickView *appViewer, QObject *parent = 0);
 
-signals:
+Q_SIGNALS:
 
 public slots:
     void generateData(int type, int rowCount, int colCount);
diff --git a/plugins/designer/qchartsplugin.cpp b/plugins/designer/qchartsplugin.cpp
index 01c67a1a..3edec489 100644
--- a/plugins/designer/qchartsplugin.cpp
+++ b/plugins/designer/qchartsplugin.cpp
@@ -48,7 +48,7 @@ QString QChartsPlugin::includeFile() const
     QString myNewLine = QStringLiteral("\n");
 #endif
     return QStringLiteral("<QtCharts/QChartView>") + myNewLine
-            + QStringLiteral("#include <chartsnamespace.h>");
+            + QStringLiteral("#include <QtCharts/chartsnamespace.h>");
 }
 
 QString QChartsPlugin::group() const
diff --git a/src/charts/barchart/vertical/bar/barchartitem_p.h b/src/charts/barchart/vertical/bar/barchartitem_p.h
index 3b99dfdb..43a113ae 100644
--- a/src/charts/barchart/vertical/bar/barchartitem_p.h
+++ b/src/charts/barchart/vertical/bar/barchartitem_p.h
@@ -41,7 +41,7 @@ class BarChartItem : public AbstractBarChartItem
 public:
     BarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
 
-private slots:
+private Q_SLOTS:
     void handleLabelsPositionChanged();
     void positionLabels();
 
diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h
index f8e85c8c..185e2c3f 100644
--- a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h
+++ b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h
@@ -43,7 +43,7 @@ public:
     PercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
     void handleUpdatedBars();
 
-private slots:
+private Q_SLOTS:
     void handleLabelsPositionChanged();
     void positionLabels();
 
diff --git a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h
index 37e59948..64c844e9 100644
--- a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h
+++ b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h
@@ -41,7 +41,7 @@ class StackedBarChartItem : public AbstractBarChartItem
 public:
     StackedBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item =0);
 
-private slots:
+private Q_SLOTS:
     void handleLabelsPositionChanged();
     void positionLabels();
 
diff --git a/src/charts/boxplotchart/qboxplotseries_p.h b/src/charts/boxplotchart/qboxplotseries_p.h
index 9de5dd79..2fcd473e 100644
--- a/src/charts/boxplotchart/qboxplotseries_p.h
+++ b/src/charts/boxplotchart/qboxplotseries_p.h
@@ -79,7 +79,7 @@ Q_SIGNALS:
     void updatedLayout();
     void restructuredBoxes();
 
-private slots:
+private Q_SLOTS:
     void handleSeriesChange(QAbstractSeries *series);
     void handleSeriesRemove(QAbstractSeries *series);
 
diff --git a/src/charts/chartpresenter_p.h b/src/charts/chartpresenter_p.h
index 3ed34249..7ec5d656 100644
--- a/src/charts/chartpresenter_p.h
+++ b/src/charts/chartpresenter_p.h
@@ -167,7 +167,7 @@ public Q_SLOTS:
     void handleAxisAdded(QAbstractAxis *axis);
     void handleAxisRemoved(QAbstractAxis *axis);
 
-signals:
+Q_SIGNALS:
     void plotAreaChanged(const QRectF &plotArea);
 
 private:
diff --git a/src/charts/chartsnamespace.h b/src/charts/chartsnamespace.h
index 63aa8cd9..7c3b55c6 100644
--- a/src/charts/chartsnamespace.h
+++ b/src/charts/chartsnamespace.h
@@ -21,6 +21,9 @@
 
 // this is needed by the designer plugin.
 
+#ifdef QT_CHARTS_USE_NAMESPACE
 QT_CHARTS_USE_NAMESPACE
+#endif
+
 
 #endif /* CHARTSNAMESPACE_H */
diff --git a/src/charts/piechart/qpieseries_p.h b/src/charts/piechart/qpieseries_p.h
index fab9c511..9c113d0b 100644
--- a/src/charts/piechart/qpieseries_p.h
+++ b/src/charts/piechart/qpieseries_p.h
@@ -58,7 +58,7 @@ public:
 
     static QPieSeriesPrivate *fromSeries(QPieSeries *series);
 
-signals:
+Q_SIGNALS:
     void calculatedDataChanged();
     void pieSizeChanged();
     void pieStartAngleChanged();
diff --git a/src/charts/qchart.h b/src/charts/qchart.h
index 7282ca99..e2d1171e 100644
--- a/src/charts/qchart.h
+++ b/src/charts/qchart.h
@@ -160,7 +160,7 @@ public:
 
     ChartType chartType() const;
 
-signals:
+Q_SIGNALS:
     void plotAreaChanged(const QRectF &plotArea);
 
 protected:
diff --git a/src/chartsqml2/declarativeaxes.h b/src/chartsqml2/declarativeaxes.h
index 1be2eafd..2386bfb3 100644
--- a/src/chartsqml2/declarativeaxes.h
+++ b/src/chartsqml2/declarativeaxes.h
@@ -52,7 +52,7 @@ public:
     void emitAxisXTopChanged() { emit axisXTopChanged(m_axisXTop); }
     void emitAxisYRightChanged() { emit axisYRightChanged(m_axisYRight); }
 
-signals:
+Q_SIGNALS:
     void axisXChanged(QAbstractAxis *axis);
     void axisYChanged(QAbstractAxis *axis);
     void axisXTopChanged(QAbstractAxis *axis);