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/qmltests.pro | |
| 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/qmltests.pro')
| -rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index b8f0f7df1..64f7414ce 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -16,6 +16,7 @@ OTHER_FILES += \ $$PWD/data/directoryupload.html \ $$PWD/data/favicon.html \ $$PWD/data/favicon2.html \ + $$PWD/data/favicon-candidates-gray.html \ $$PWD/data/favicon-misc.html \ $$PWD/data/favicon-multi.html \ $$PWD/data/favicon-multi-gray.html \ @@ -65,6 +66,11 @@ OTHER_FILES += \ $$PWD/data/tst_settings.qml \ $$PWD/data/tst_keyboardModifierMapping.qml \ $$PWD/data/icons/favicon.png \ + $$PWD/data/icons/gray128.png \ + $$PWD/data/icons/gray16.png \ + $$PWD/data/icons/gray255.png \ + $$PWD/data/icons/gray32.png \ + $$PWD/data/icons/gray64.png \ $$PWD/data/icons/grayicons.ico \ $$PWD/data/icons/small-favicon.png \ $$PWD/data/icons/qt144.png \ |