Merge branch 'develop'

Change-Id: I55a342465fa2ddb6db14056f4a991bdc1d4ef8ce

2 files changed, 3 insertions, 3 deletions

diff --git a/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.h b/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.h
index 69a40a46..3f380508 100644
--- a/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.h
+++ b/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.h
@@ -104,7 +104,7 @@ private:
 
     bool initialize();
 
-signals:
+Q_SIGNALS:
     void dataNotification();
     void statusNotification(QKinect::KinectStatus);
 };
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: