diff options
| -rw-r--r-- | tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp | 16 | ||||
| -rw-r--r-- | tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp index e3de6ff03..f201756d1 100644 --- a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp +++ b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp @@ -105,13 +105,7 @@ class tst_QDeclarativeVideoOutput : public QObject { Q_OBJECT public: - tst_QDeclarativeVideoOutput() - : m_mappingComponent(0) - , m_mappingOutput(0) - , m_mappingSurface(0) - { - qRegisterMetaType<QDeclarativeVideoOutput::FillMode>(); - } + tst_QDeclarativeVideoOutput(); ~tst_QDeclarativeVideoOutput() { @@ -181,6 +175,14 @@ void tst_QDeclarativeVideoOutput::initTestCase() Q_DECLARE_METATYPE(QDeclarativeVideoOutput::FillMode) +tst_QDeclarativeVideoOutput::tst_QDeclarativeVideoOutput() + : m_mappingComponent(0) + , m_mappingOutput(0) + , m_mappingSurface(0) +{ + qRegisterMetaType<QDeclarativeVideoOutput::FillMode>(); +} + void tst_QDeclarativeVideoOutput::fillMode() { QQmlComponent component(&m_engine); diff --git a/tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp b/tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp index 1b7b3cd66..a03383484 100644 --- a/tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp +++ b/tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp @@ -80,6 +80,8 @@ private slots: void readPerByte(); }; +Q_DECLARE_METATYPE(tst_QWaveDecoder::Corruption) + void tst_QWaveDecoder::init() { } @@ -308,8 +310,6 @@ void tst_QWaveDecoder::readPerByte() stream.close(); } -Q_DECLARE_METATYPE(tst_QWaveDecoder::Corruption) - QTEST_MAIN(tst_QWaveDecoder) #include "tst_qwavedecoder.moc" |