diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-04-12 17:35:19 +0200 |
---|---|---|
committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-05-04 12:27:20 +0000 |
commit | 240efee49a8e4402f2048a05c596605b2feadbd3 (patch) | |
tree | 8df93a1a1732bafe78192f70cfdb54bde8b1b3b5 /tests/auto/quick/qmltests/data/tst_favicon.qml | |
parent | 0bf8a13a4d0391339bae686e199fb922b64a1dcc (diff) |
Combine candidate icons for a page into a single icon
For the Widget API the QIcon returned by QWebEnginePage::icon() function
contains all the candidate icons for the current page.
For the Quick API the QQuickWebEngineFaviconProvider provides the best
quality icon for the requested size from the candidates.
Task-number: QTBUG-51179
Change-Id: I42b8427f957e2f2fc745dd0111bedcc71b577216
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'tests/auto/quick/qmltests/data/tst_favicon.qml')
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_favicon.qml | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_favicon.qml b/tests/auto/quick/qmltests/data/tst_favicon.qml index e959f19be..633859add 100644 --- a/tests/auto/quick/qmltests/data/tst_favicon.qml +++ b/tests/auto/quick/qmltests/data/tst_favicon.qml @@ -261,16 +261,26 @@ TestWebEngineView { function test_faviconProvider_data() { return [ - { tag: "8x8", size: 8, value: 16 }, - { tag: "16x16", size: 16, value: 16 }, - { tag: "17x17", size: 17, value: 32 }, - { tag: "31x31", size: 31, value: 32 }, - { tag: "32x32", size: 32, value: 32 }, - { tag: "33x33", size: 33, value: 64 }, - { tag: "64x64", size: 64, value: 64 }, - { tag: "128x128", size: 128, value: 128 }, - { tag: "255x255", size: 255, value: 255 }, - { tag: "256x256", size: 256, value: 255 }, + { tag: "multi 8x8", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 8, value: 16 }, + { tag: "multi 16x16", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 16, value: 16 }, + { tag: "multi 17x17", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 17, value: 32 }, + { tag: "multi 31x31", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 31, value: 32 }, + { tag: "multi 32x32", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 32, value: 32 }, + { tag: "multi 33x33", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 33, value: 64 }, + { tag: "multi 64x64", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 64, value: 64 }, + { tag: "multi 128x128", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 128, value: 128 }, + { tag: "multi 255x255", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 255, value: 255 }, + { tag: "multi 256x256", url: Qt.resolvedUrl("favicon-multi-gray.html"), size: 256, value: 255 }, + { tag: "candidate 8x8", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 8, value: 16 }, + { tag: "candidate 16x16", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 16, value: 16 }, + { tag: "candidate 17x17", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 17, value: 32 }, + { tag: "candidate 31x31", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 31, value: 32 }, + { tag: "candidate 32x32", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 32, value: 32 }, + { tag: "candidate 33x33", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 33, value: 64 }, + { tag: "candidate 64x64", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 64, value: 64 }, + { tag: "candidate 128x128", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 128, value: 128 }, + { tag: "candidate 255x255", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 255, value: 255 }, + { tag: "candidate 256x256", url: Qt.resolvedUrl("favicon-candidates-gray.html"), size: 256, value: 255 }, ]; } @@ -287,8 +297,7 @@ TestWebEngineView { compare(iconChangedSpy.count, 0) - var url = Qt.resolvedUrl("favicon-multi-gray.html") - webEngineView.url = url + webEngineView.url = row.url verify(webEngineView.waitForLoadSucceeded()) iconChangedSpy.wait() |