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/datavisualizationqml2/abstractdeclarative_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualizationqml2/abstractdeclarative_p.h') diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 9625e859..3509f7ab 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -224,7 +224,7 @@ public: void setMargin(qreal margin); qreal margin() const; -public slots: +public Q_SLOTS: virtual void handleAxisXChanged(QAbstract3DAxis *axis) = 0; virtual void handleAxisYChanged(QAbstract3DAxis *axis) = 0; virtual void handleAxisZChanged(QAbstract3DAxis *axis) = 0; @@ -247,7 +247,7 @@ protected: virtual void handleOptimizationHintChange(QAbstract3DGraph::OptimizationHints hints); virtual QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *); -signals: +Q_SIGNALS: void selectionModeChanged(AbstractDeclarative::SelectionFlags mode); void shadowQualityChanged(AbstractDeclarative::ShadowQuality quality); void shadowsSupportedChanged(bool supported); -- cgit v1.2.3