diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-10 08:16:32 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-10 08:16:32 (GMT) |
| commit | 5579225277387c8cd207a0230e285eaa22fb2957 (patch) | |
| tree | 72649cfe5b36c93333da78ba70b6a3ff9a6edb9d | |
| parent | 219080cf6ed195cf23a823d0b775f713d68f0b2d (diff) | |
| download | Qt-5579225277387c8cd207a0230e285eaa22fb2957.zip Qt-5579225277387c8cd207a0230e285eaa22fb2957.tar.gz Qt-5579225277387c8cd207a0230e285eaa22fb2957.tar.bz2 | |
ignore (expect) message in test
| -rw-r--r-- | src/declarative/extra/qmlfontloader.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/extra/qmlfontloader.cpp b/src/declarative/extra/qmlfontloader.cpp index f51ef98..36ee1bb 100644 --- a/src/declarative/extra/qmlfontloader.cpp +++ b/src/declarative/extra/qmlfontloader.cpp @@ -211,7 +211,7 @@ void QmlFontLoaderPrivate::addFontToDatabase(const QByteArray &ba) status = QmlFontLoader::Ready; } else { status = QmlFontLoader::Error; - qWarning() << "Cannot load font: " << name << url; + qWarning() << "Cannot load font:" << url; } emit q->statusChanged(); } diff --git a/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp b/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp index a5ab13d..954046e 100644 --- a/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp +++ b/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp @@ -110,6 +110,7 @@ void tst_qmlfontloader::localFont() void tst_qmlfontloader::failLocalFont() { QString componentStr = "import Qt 4.6\nFontLoader { source: \"" SRCDIR "/data/dummy.ttf\" }"; + QTest::ignoreMessage(QtWarningMsg, "Cannot load font: QUrl( \"file://" SRCDIR "/data/dummy.ttf\" ) "); QmlComponent component(&engine, componentStr.toLatin1(), QUrl("file://")); QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create()); @@ -134,6 +135,7 @@ void tst_qmlfontloader::webFont() void tst_qmlfontloader::failWebFont() { QString componentStr = "import Qt 4.6\nFontLoader { source: \"http://wrong.address.com/Starburst.ttf\" }"; + QTest::ignoreMessage(QtWarningMsg, "Cannot load font: QUrl( \"http://wrong.address.com/Starburst.ttf\" ) "); QmlComponent component(&engine, componentStr.toLatin1(), QUrl("file://")); QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create()); |