diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-17 03:51:43 (GMT) |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-17 03:51:43 (GMT) |
| commit | 401ee4c7b14146b39419dafe1981c6a8a108196e (patch) | |
| tree | aef9a5190f5ed3ba1fa2d51b57152f8055c3b7d8 | |
| parent | a2aaed149cffdde161fc1fc7d718b3fd7f6c96c5 (diff) | |
| download | Qt-401ee4c7b14146b39419dafe1981c6a8a108196e.zip Qt-401ee4c7b14146b39419dafe1981c6a8a108196e.tar.gz Qt-401ee4c7b14146b39419dafe1981c6a8a108196e.tar.bz2 | |
Make QMediaPlaylist test pass.
The test was failing because an ignored warning wasn't being output.
Remove both the warning and ignore statements.
| -rw-r--r-- | src/multimedia/base/qmediapluginloader.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/multimedia/base/qmediapluginloader.cpp b/src/multimedia/base/qmediapluginloader.cpp index 8130413..24c5aba 100644 --- a/src/multimedia/base/qmediapluginloader.cpp +++ b/src/multimedia/base/qmediapluginloader.cpp @@ -88,7 +88,6 @@ void QMediaPluginLoader::load() return; if (staticMediaPlugins() && staticMediaPlugins()->contains(m_location)) { - qWarning() << "Load static plugins for" << m_location; foreach(QObject *o, staticMediaPlugins()->value(m_location)) { if (o != 0 && o->qt_metacast(m_iid) != 0) { QFactoryInterface* p = qobject_cast<QFactoryInterface*>(o); diff --git a/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp index adaa56c..383a407 100644 --- a/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp +++ b/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp @@ -403,7 +403,6 @@ void tst_QMediaPlaylist::saveAndLoad() QBuffer buffer; buffer.open(QBuffer::ReadWrite); - QTest::ignoreMessage(QtWarningMsg, "Load static plugins for \"/playlistformats/\" "); bool res = playlist.save(&buffer, "unsupported_format"); QVERIFY(!res); QVERIFY(playlist.error() != QMediaPlaylist::NoError); |