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>
This commit is contained in:
Thiago Macieira
2012-08-01 16:19:36 +02:00
committed by Qt by Nokia
parent eedfcdacce
commit 3e7f0f673a
2 changed files with 11 additions and 9 deletions

View File

@@ -105,13 +105,7 @@ class tst_QDeclarativeVideoOutput : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
tst_QDeclarativeVideoOutput() 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) 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() void tst_QDeclarativeVideoOutput::fillMode()
{ {
QQmlComponent component(&m_engine); QQmlComponent component(&m_engine);

View File

@@ -80,6 +80,8 @@ private slots:
void readPerByte(); void readPerByte();
}; };
Q_DECLARE_METATYPE(tst_QWaveDecoder::Corruption)
void tst_QWaveDecoder::init() void tst_QWaveDecoder::init()
{ {
} }
@@ -308,8 +310,6 @@ void tst_QWaveDecoder::readPerByte()
stream.close(); stream.close();
} }
Q_DECLARE_METATYPE(tst_QWaveDecoder::Corruption)
QTEST_MAIN(tst_QWaveDecoder) QTEST_MAIN(tst_QWaveDecoder)
#include "tst_qwavedecoder.moc" #include "tst_qwavedecoder.moc"