diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-06-17 14:01:44 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-06-17 14:24:57 +0300 |
commit | a71eb045af5a00fe135201f8b3c5999eda26e0bd (patch) | |
tree | b19c639be2034987e234e106104d89b5f6586608 /tests | |
parent | 916d67d2664b0262cd03b28ad0c694924dd09b13 (diff) |
Fix building against 5.6
Apparently Qt modules are now required to use Q_SIGNALS and Q_SLOTS
macros instead of 'signals' and 'slots' in headers.
Change-Id: I4140b1fff4386d74bb371176919234366965e887
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/barstest/chart.h | 4 | ||||
-rw-r--r-- | tests/directional/scatterdatamodifier.h | 4 | ||||
-rw-r--r-- | tests/kinectsurface/QtKinectWrapper/QKinectWrapper.h | 2 | ||||
-rw-r--r-- | tests/kinectsurface/surfacedata.h | 4 | ||||
-rw-r--r-- | tests/multigraphs/data.h | 4 | ||||
-rw-r--r-- | tests/qmlperf/datagenerator.h | 2 | ||||
-rw-r--r-- | tests/scattertest/scatterchart.h | 4 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/engine.h | 6 | ||||
-rw-r--r-- | tests/spectrum/spectrumapp/spectrumanalyser.h | 8 | ||||
-rw-r--r-- | tests/surfacetest/graphmodifier.h | 2 | ||||
-rw-r--r-- | tests/volumetrictest/volumetrictest.h | 2 |
11 files changed, 21 insertions, 21 deletions
diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h index b1460606..8ae4f4af 100644 --- a/tests/barstest/chart.h +++ b/tests/barstest/chart.h @@ -102,7 +102,7 @@ public: void setReflectivity(int value); void toggleCustomItem(); -public slots: +public Q_SLOTS: void flipViews(); void setGradient(); void toggleMultiseriesScaling(); @@ -128,7 +128,7 @@ public slots: void setFloorLevel(int value); void setGraphMargin(int value); -signals: +Q_SIGNALS: void shadowQualityChanged(int quality); private: diff --git a/tests/directional/scatterdatamodifier.h b/tests/directional/scatterdatamodifier.h index 0440ea01..878743cb 100644 --- a/tests/directional/scatterdatamodifier.h +++ b/tests/directional/scatterdatamodifier.h @@ -45,14 +45,14 @@ public: void toggleRotation(); void start(); -public slots: +public Q_SLOTS: void changeStyle(int style); void changeTheme(int theme); void changeShadowQuality(int quality); void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality); void triggerRotation(); -signals: +Q_SIGNALS: void backgroundEnabledChanged(bool enabled); void gridEnabledChanged(bool enabled); void shadowQualityChanged(int quality); 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: diff --git a/tests/multigraphs/data.h b/tests/multigraphs/data.h index d3e60fec..01b53243 100644 --- a/tests/multigraphs/data.h +++ b/tests/multigraphs/data.h @@ -56,7 +56,7 @@ public: Bars }; -public slots: +public Q_SLOTS: void setResolution(int selection); void changeMode(int mode); @@ -84,7 +84,7 @@ public: QWidget *buttonOne, QWidget *buttonTwo); ~ContainerChanger(); -public slots: +public Q_SLOTS: void changeContainer(int container); private: diff --git a/tests/qmlperf/datagenerator.h b/tests/qmlperf/datagenerator.h index ce7d235e..32261df8 100644 --- a/tests/qmlperf/datagenerator.h +++ b/tests/qmlperf/datagenerator.h @@ -31,7 +31,7 @@ public: DataGenerator(QObject *parent = 0); virtual ~DataGenerator(); -public slots: +public Q_SLOTS: void generateData(QScatter3DSeries *series, uint count); void add(QScatter3DSeries *series, uint count); void writeLine(int itemCount, float fps); diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h index 139def24..67a76406 100644 --- a/tests/scattertest/scatterchart.h +++ b/tests/scattertest/scatterchart.h @@ -63,7 +63,7 @@ public: void testItemChanges(); void testAxisReverse(); -public slots: +public Q_SLOTS: void changeShadowQuality(int quality); void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality); void clear(); @@ -103,7 +103,7 @@ public slots: void setCameraTargetZ(int value); void setGraphMargin(int value); -signals: +Q_SIGNALS: void shadowQualityChanged(int quality); private: 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: diff --git a/tests/surfacetest/graphmodifier.h b/tests/surfacetest/graphmodifier.h index b827ecee..f3811dfc 100644 --- a/tests/surfacetest/graphmodifier.h +++ b/tests/surfacetest/graphmodifier.h @@ -116,7 +116,7 @@ public: void setHorizontalAspectRatio(int ratio); void setSurfaceTexture(bool enabled); -public slots: +public Q_SLOTS: void changeShadowQuality(int quality); void changeTheme(int theme); void flipViews(); diff --git a/tests/volumetrictest/volumetrictest.h b/tests/volumetrictest/volumetrictest.h index d437b85c..bcbba93a 100644 --- a/tests/volumetrictest/volumetrictest.h +++ b/tests/volumetrictest/volumetrictest.h @@ -39,7 +39,7 @@ public: void setFpsLabel(QLabel *fpsLabel); void setSliceLabels(QLabel *xLabel, QLabel *yLabel, QLabel *zLabel); -public slots: +public Q_SLOTS: void sliceX(int enabled); void sliceY(int enabled); void sliceZ(int enabled); |