diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-11 07:32:52 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-11 07:32:52 (GMT) |
| commit | 162287900e724947e976ec5bdcc1bcb99639b5ab (patch) | |
| tree | 2720b58c33aa4d1c08909f43fe8ac2477c27bc6a | |
| parent | 3548ee78b268a1ece0fe295528bf0dad871fb6af (diff) | |
| download | Qt-162287900e724947e976ec5bdcc1bcb99639b5ab.zip Qt-162287900e724947e976ec5bdcc1bcb99639b5ab.tar.gz Qt-162287900e724947e976ec5bdcc1bcb99639b5ab.tar.bz2 | |
Fix test, fix warning consistency.
address.com must really get sick of test robots.
| -rw-r--r-- | src/declarative/util/qdeclarativefontloader.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp index 0509242..bf98d40 100644 --- a/src/declarative/util/qdeclarativefontloader.cpp +++ b/src/declarative/util/qdeclarativefontloader.cpp @@ -231,6 +231,7 @@ void QDeclarativeFontLoader::replyFinished() d->addFontToDatabase(ba); } else { d->status = Error; + qWarning() << "Cannot load font:" << d->reply->url(); emit statusChanged(); } d->reply->deleteLater(); diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp index a9762df..add3c7b 100644 --- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp +++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp @@ -139,8 +139,8 @@ void tst_qdeclarativefontloader::webFont() void tst_qdeclarativefontloader::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\" ) "); + QString componentStr = "import Qt 4.6\nFontLoader { source: \"http://wrong.address.nokia.com/Starburst.ttf\" }"; + QTest::ignoreMessage(QtWarningMsg, "Cannot load font: QUrl( \"http://wrong.address.nokia.com/Starburst.ttf\" ) "); QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create()); |