summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/abstract3dcontroller_p.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2015-09-14 10:47:08 +0300
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2015-09-14 11:11:51 +0300
commitd1e65f10217f51f81935df90129f82217d3648ed (patch)
treed9c37ee021008b497609816045d91f6cdde09231 /src/datavisualization/engine/abstract3dcontroller_p.h
parent5ba7f70d0d94de720d49b37b2d257b51b9afd026 (diff)
parentdc6dcf918bcf4f350ab92ab659506b4a0f8d80f6 (diff)
Merge branch 'develop'
Diffstat (limited to 'src/datavisualization/engine/abstract3dcontroller_p.h')
-rw-r--r--src/datavisualization/engine/abstract3dcontroller_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index bfb6dd6a..9c24711b 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -347,7 +347,7 @@ public:
void markSeriesItemLabelsDirty();
bool isOpenGLES() const;
-public slots:
+public Q_SLOTS:
void destroyRenderer();
void handleAxisTitleChanged(const QString &title);
@@ -380,7 +380,7 @@ public slots:
void updateCustomItem();
-signals:
+Q_SIGNALS:
void shadowQualityChanged(QAbstract3DGraph::ShadowQuality quality);
void activeInputHandlerChanged(QAbstract3DInputHandler *inputHandler);
void activeThemeChanged(Q3DTheme *activeTheme);