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/datavisualization/input | |
| parent | 5ba7f70d0d94de720d49b37b2d257b51b9afd026 (diff) | |
| parent | dc6dcf918bcf4f350ab92ab659506b4a0f8d80f6 (diff) | |
Merge branch 'develop'
Change-Id: I55a342465fa2ddb6db14056f4a991bdc1d4ef8ce
Diffstat (limited to 'src/datavisualization/input')
| -rw-r--r-- | src/datavisualization/input/q3dinputhandler.h | 2 | ||||
| -rw-r--r-- | src/datavisualization/input/q3dinputhandler_p.h | 2 | ||||
| -rw-r--r-- | src/datavisualization/input/qabstract3dinputhandler.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h index 84641e75..c4ded4fd 100644 --- a/src/datavisualization/input/q3dinputhandler.h +++ b/src/datavisualization/input/q3dinputhandler.h @@ -52,7 +52,7 @@ public: virtual void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos); virtual void wheelEvent(QWheelEvent *event); -signals: +Q_SIGNALS: void rotationEnabledChanged(bool enable); void zoomEnabledChanged(bool enable); void selectionEnabledChanged(bool enable); diff --git a/src/datavisualization/input/q3dinputhandler_p.h b/src/datavisualization/input/q3dinputhandler_p.h index e6358c91..b5fc89fa 100644 --- a/src/datavisualization/input/q3dinputhandler_p.h +++ b/src/datavisualization/input/q3dinputhandler_p.h @@ -43,7 +43,7 @@ public: Q3DInputHandlerPrivate(Q3DInputHandler *q); ~Q3DInputHandlerPrivate(); -public slots: +public Q_SLOTS: void handleSceneChange(Q3DScene *scene); void handleQueriedGraphPositionChange(); diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 369e10d9..30ac3aac 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -68,7 +68,7 @@ public: Q3DScene *scene() const; void setScene(Q3DScene *scene); -signals: +Q_SIGNALS: void positionChanged(const QPoint &position); void inputViewChanged(QAbstract3DInputHandler::InputView view); void sceneChanged(Q3DScene *scene); |