diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-02-11 16:38:47 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-02-25 07:14:32 +0000 |
| commit | 837347e1901086a9757b5aca7e5bbee7b0d8e20e (patch) | |
| tree | e0bf0ed4ae2523f87e96e65b57858c5e5f3405d7 /src/core/type_conversion.cpp | |
| parent | 598bfc652edffb047948e01c3c76eb9e0cb7db4e (diff) | |
Fix handling of touch icons when it is disabled
Store the icon type in a bitfield because the same icon URL might be
used for various types on same page. This way webengine won't ignore to
download a default icon what is also set as a touch icon when touch
icons are disabled.
Moreover, do not store the icon types from the previous page because
a subsequent page might use the same icon URL but with different type.
With this change the type of the cached icons are updated after each
page load.
Fixes: QTBUG-70081
Change-Id: I8031a740b07b0c6a8e5759a994f386b13ce87be2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/type_conversion.cpp')
| -rw-r--r-- | src/core/type_conversion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/type_conversion.cpp b/src/core/type_conversion.cpp index d35426ac3..f69b2a297 100644 --- a/src/core/type_conversion.cpp +++ b/src/core/type_conversion.cpp @@ -216,7 +216,7 @@ int flagsFromModifiers(Qt::KeyboardModifiers modifiers) return modifierFlags; } -FaviconInfo::FaviconType toQt(content::FaviconURL::IconType type) +FaviconInfo::FaviconTypeFlags toQt(content::FaviconURL::IconType type) { switch (type) { case content::FaviconURL::IconType::kFavicon: |