From a71eb045af5a00fe135201f8b3c5999eda26e0bd Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 17 Jun 2015 14:01:44 +0300 Subject: 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 --- src/datavisualization/axis/qabstract3daxis.h | 2 +- src/datavisualization/axis/qcategory3daxis.h | 2 +- src/datavisualization/axis/qlogvalue3daxisformatter.h | 2 +- src/datavisualization/axis/qvalue3daxis.h | 2 +- src/datavisualization/axis/qvalue3daxis_p.h | 2 +- src/datavisualization/axis/qvalue3daxisformatter_p.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/datavisualization/axis') diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h index 52c29531..69d4043c 100644 --- a/src/datavisualization/axis/qabstract3daxis.h +++ b/src/datavisualization/axis/qabstract3daxis.h @@ -93,7 +93,7 @@ public: void setTitleFixed(bool fixed); bool isTitleFixed() const; -signals: +Q_SIGNALS: void titleChanged(const QString &newTitle); void labelsChanged(); void orientationChanged(QAbstract3DAxis::AxisOrientation orientation); diff --git a/src/datavisualization/axis/qcategory3daxis.h b/src/datavisualization/axis/qcategory3daxis.h index fa72f29d..30c8c602 100644 --- a/src/datavisualization/axis/qcategory3daxis.h +++ b/src/datavisualization/axis/qcategory3daxis.h @@ -37,7 +37,7 @@ public: void setLabels(const QStringList &labels); QStringList labels() const; -signals: +Q_SIGNALS: void labelsChanged(); protected: diff --git a/src/datavisualization/axis/qlogvalue3daxisformatter.h b/src/datavisualization/axis/qlogvalue3daxisformatter.h index b4aabc3c..13ddf356 100644 --- a/src/datavisualization/axis/qlogvalue3daxisformatter.h +++ b/src/datavisualization/axis/qlogvalue3daxisformatter.h @@ -46,7 +46,7 @@ public: void setShowEdgeLabels(bool enabled); bool showEdgeLabels() const; -signals: +Q_SIGNALS: void baseChanged(qreal base); void autoSubGridChanged(bool enabled); void showEdgeLabelsChanged(bool enabled); diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h index e301e78b..14ed7102 100644 --- a/src/datavisualization/axis/qvalue3daxis.h +++ b/src/datavisualization/axis/qvalue3daxis.h @@ -54,7 +54,7 @@ public: void setReversed(bool enable); bool reversed() const; -signals: +Q_SIGNALS: void segmentCountChanged(int count); void subSegmentCountChanged(int count); void labelFormatChanged(const QString &format); diff --git a/src/datavisualization/axis/qvalue3daxis_p.h b/src/datavisualization/axis/qvalue3daxis_p.h index 9a151b68..b712461f 100644 --- a/src/datavisualization/axis/qvalue3daxis_p.h +++ b/src/datavisualization/axis/qvalue3daxis_p.h @@ -48,7 +48,7 @@ public: void emitLabelsChanged(); -signals: +Q_SIGNALS: void formatterDirty(); protected: diff --git a/src/datavisualization/axis/qvalue3daxisformatter_p.h b/src/datavisualization/axis/qvalue3daxisformatter_p.h index a71953b6..a8a09662 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter_p.h +++ b/src/datavisualization/axis/qvalue3daxisformatter_p.h @@ -58,7 +58,7 @@ public: void setAxis(QValue3DAxis *axis); void markDirty(bool labelsChange); -public slots: +public Q_SLOTS: void markDirtyNoLabelChange(); protected: -- cgit v1.2.3