diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-08-01 16:19:36 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-06 04:02:20 +0200 |
commit | 3e7f0f673a205ce33f31e7ef25afb47a0d6edc93 (patch) | |
tree | 799fe0f9e08bb358d118e58078756b27acb76278 /tests | |
parent | eedfcdaccea09d129c974e7527f760af4d5bec5b (diff) |
Compile in C++11 mode: the Q_DECLARE_METATYPE must be visible
The error was:
tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp:113:62: required from here
qmetatype.h:637:5: error: static assertion failed: Type is not registered, please use Q_DECLARE_METATYPE macro to make it know to Qt's meta-object system
Change-Id: Id4e29803de646cbad0d401b1fe0e0b38e458d12f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Diffstat (limited to 'tests')
-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" |