diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-25 09:47:18 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-25 09:47:18 +0100 |
| commit | cda76002257d56ffedbf8d28211cfd66a7226e73 (patch) | |
| tree | 03e8a7fcdfa389771d6ade5afbe5d2536328eef2 /src/core/extensions/mime_handler_view_guest_delegate_qt.h | |
| parent | b97f0eb87b6e6a6726b805c9de2159c6ad983f7d (diff) | |
| parent | 631f1dd72027207cf6c49a380671c58f096a37a5 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/core/api/qtbug-60565.cpp
Change-Id: Iaad05aa248fb57a69033013161e10e3acddd48f6
Diffstat (limited to 'src/core/extensions/mime_handler_view_guest_delegate_qt.h')
| -rw-r--r-- | src/core/extensions/mime_handler_view_guest_delegate_qt.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/extensions/mime_handler_view_guest_delegate_qt.h b/src/core/extensions/mime_handler_view_guest_delegate_qt.h index b679c7a38..6cd80689c 100644 --- a/src/core/extensions/mime_handler_view_guest_delegate_qt.h +++ b/src/core/extensions/mime_handler_view_guest_delegate_qt.h @@ -66,8 +66,6 @@ public: const content::ContextMenuParams ¶ms) override; private: - MimeHandlerViewGuest *guest_; // Owns us. - DISALLOW_COPY_AND_ASSIGN(MimeHandlerViewGuestDelegateQt); }; |