diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-09-14 10:47:08 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-09-14 11:11:51 +0300 |
| commit | d1e65f10217f51f81935df90129f82217d3648ed (patch) | |
| tree | d9c37ee021008b497609816045d91f6cdde09231 /src/datavisualizationqml2/abstractdeclarative_p.h | |
| parent | 5ba7f70d0d94de720d49b37b2d257b51b9afd026 (diff) | |
| parent | dc6dcf918bcf4f350ab92ab659506b4a0f8d80f6 (diff) | |
Merge branch 'develop'
Change-Id: I55a342465fa2ddb6db14056f4a991bdc1d4ef8ce
Diffstat (limited to 'src/datavisualizationqml2/abstractdeclarative_p.h')
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); |