Merge branch 'develop'

Change-Id: I55a342465fa2ddb6db14056f4a991bdc1d4ef8ce

2 files changed, 7 insertions, 7 deletions

diff --git a/tests/spectrum/spectrumapp/engine.h b/tests/spectrum/spectrumapp/engine.h
index 6fc7a384..2ebc392d 100644
--- a/tests/spectrum/spectrumapp/engine.h
+++ b/tests/spectrum/spectrumapp/engine.h
@@ -117,14 +117,14 @@ public:
      */
     void setWindowFunction(WindowFunction type);
 
-public slots:
+public Q_SLOTS:
     void startRecording();
     void startPlayback();
     void suspend();
     void setAudioInputDevice(const QAudioDeviceInfo &device);
     void setAudioOutputDevice(const QAudioDeviceInfo &device);
 
-signals:
+Q_SIGNALS:
     void stateChanged(QAudio::Mode mode, QAudio::State state);
 
     /**
@@ -179,7 +179,7 @@ signals:
      */
     void bufferChanged(qint64 position, qint64 length, const QByteArray &buffer);
 
-private slots:
+private Q_SLOTS:
     void audioNotify();
     void audioStateChanged(QAudio::State state);
     void audioDataReady();
diff --git a/tests/spectrum/spectrumapp/spectrumanalyser.h b/tests/spectrum/spectrumapp/spectrumanalyser.h
index f24e44a7..16588014 100644
--- a/tests/spectrum/spectrumapp/spectrumanalyser.h
+++ b/tests/spectrum/spectrumapp/spectrumanalyser.h
@@ -47,13 +47,13 @@ public:
     SpectrumAnalyserThread(QObject *parent);
     ~SpectrumAnalyserThread();
 
-public slots:
+public Q_SLOTS:
     void setWindowFunction(WindowFunction type);
     void calculateSpectrum(const QByteArray &buffer,
                            int inputFrequency,
                            int bytesPerSample);
 
-signals:
+Q_SIGNALS:
     void calculationComplete(const FrequencySpectrum &spectrum);
 
 private:
@@ -124,10 +124,10 @@ public:
      */
     void cancelCalculation();
 
-signals:
+Q_SIGNALS:
     void spectrumChanged(const FrequencySpectrum &spectrum);
 
-private slots:
+private Q_SLOTS:
     void calculationComplete(const FrequencySpectrum &spectrum);
 
 private: