diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-09-04 12:12:51 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-09-04 12:12:51 +0300 |
| commit | ff1272de6bb44dda30b90c62806d037ca4ef8b77 (patch) | |
| tree | 8b278bdb97f667ce54e3b36b71e4b6b8c7f49df3 /src/core/favicon_manager.h | |
| parent | 48c85451adf1d530bccf9bfb542abb3211f0bf36 (diff) | |
| parent | a6abc01319798e2175914323273e91927516eba0 (diff) | |
Merge dev into 5.14 (delayed final downmerge)
This replicates the effects of the fast-forward merge that should have
been pushed on 2019-08-27 as the final down-merge from dev to 5.14.
Task-number: QTBUG-78019
Change-Id: I89e81a2d285e57eaf29e8cfef4abaf458b352c3b
Diffstat (limited to 'src/core/favicon_manager.h')
| -rw-r--r-- | src/core/favicon_manager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/favicon_manager.h b/src/core/favicon_manager.h index df74f6303..a8247d15f 100644 --- a/src/core/favicon_manager.h +++ b/src/core/favicon_manager.h @@ -90,7 +90,7 @@ public: TouchIcon = 1 << 1, TouchPrecomposedIcon = 1 << 2 }; - Q_DECLARE_FLAGS(FaviconTypeFlags, FaviconTypeFlag); + Q_DECLARE_FLAGS(FaviconTypeFlags, FaviconTypeFlag) FaviconInfo(); FaviconInfo(const FaviconInfo &); |