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 /tests/kinectsurface/surfacedata.h | |
| parent | 5ba7f70d0d94de720d49b37b2d257b51b9afd026 (diff) | |
| parent | dc6dcf918bcf4f350ab92ab659506b4a0f8d80f6 (diff) | |
Merge branch 'develop'
Change-Id: I55a342465fa2ddb6db14056f4a991bdc1d4ef8ce
Diffstat (limited to 'tests/kinectsurface/surfacedata.h')
| -rw-r--r-- | tests/kinectsurface/surfacedata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/kinectsurface/surfacedata.h b/tests/kinectsurface/surfacedata.h index d06799ad..8e29b5c7 100644 --- a/tests/kinectsurface/surfacedata.h +++ b/tests/kinectsurface/surfacedata.h @@ -60,7 +60,7 @@ public: MeshBars }; -public slots: +public Q_SLOTS: void setResolution(int selection); void changeMode(int mode); @@ -89,7 +89,7 @@ public: QWidget *buttonOne, QWidget *buttonTwo); ~ContainerChanger(); -public slots: +public Q_SLOTS: void changeContainer(int container); private: |