diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-04 11:43:54 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-04 11:45:58 +0100 |
| commit | 2b3f5b66af4f06a57216575a44f54c1d20fb12a0 (patch) | |
| tree | b58f6a31b9d97b4693d485ea1a794fa6b8c5d875 /src/core/type_conversion.cpp | |
| parent | 4dc312011bcaa2ee2cf812b5b84dc9238130e608 (diff) | |
| parent | 56fadb571f32b721d8b99554e6e38692009ec37f (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I1dd136df7004b11e2f38a2ec4e82a6fa81627479
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 ef16e2add..02d2db448 100644 --- a/src/core/type_conversion.cpp +++ b/src/core/type_conversion.cpp @@ -218,7 +218,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: |