diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-26 01:54:04 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-26 04:15:47 (GMT) |
| commit | 93b02976b7c9c3a36cac475c1935622ebc2f1fe1 (patch) | |
| tree | 7c409125557585a15aa43fa9ce6badbb1bd7baaa /tests/auto | |
| parent | 46340f1c5f8765276701a2831d6efd45607d8ff5 (diff) | |
| download | Qt-93b02976b7c9c3a36cac475c1935622ebc2f1fe1.zip Qt-93b02976b7c9c3a36cac475c1935622ebc2f1fe1.tar.gz Qt-93b02976b7c9c3a36cac475c1935622ebc2f1fe1.tar.bz2 | |
Test, demo, and work-around bug QTBUG-8535
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/qdeclarativewebview/data/forward.html | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativewebview/data/forward.html b/tests/auto/declarative/qdeclarativewebview/data/forward.html index 030446a..62ab62d 100644 --- a/tests/auto/declarative/qdeclarativewebview/data/forward.html +++ b/tests/auto/declarative/qdeclarativewebview/data/forward.html @@ -1,6 +1,6 @@ <html> <head><title>Forward</title> -<link rel="icon" sizes="48x48" href="basic.png"> +<link rel="icon" sizes="32x32" href="forward.png"> </head> <body leftmargin="0" marginwidth="0"> <table width="123"> diff --git a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp index 2634825..6d16056 100644 --- a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp +++ b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp @@ -277,6 +277,8 @@ void tst_qdeclarativewebview::historyNav() wv->setUrl(QUrl::fromLocalFile(SRCDIR "/data/forward.html")); QTRY_COMPARE(wv->progress(), 1.0); QCOMPARE(wv->title(),QString("Forward")); + QTRY_COMPARE(wv->icon().width(), 32); + QCOMPARE(wv->icon(),QPixmap(SRCDIR "/data/forward.png")); QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/forward.html")), strippedHtml(wv->html())); QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/forward.html")); QCOMPARE(wv->status(), QDeclarativeWebView::Ready); |