diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-09-04 11:31:59 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-12-02 09:18:42 +0100 |
| commit | 5dc3a3fb5e3286a9643fece7c7f94cec7fc29f3e (patch) | |
| tree | 1a7d2baf14aa414321914b7fa9ea70591c1577ea /src/core/ozone | |
| parent | 4f285f7b2a1316bbad6e74258305613933f574c8 (diff) | |
Adaptations for Chromium 92
Change-Id: I1849c130ca75615802744275f6e4212a755c39b4
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/ozone')
| -rw-r--r-- | src/core/ozone/BUILD.gn | 1 | ||||
| -rw-r--r-- | src/core/ozone/platform_window_qt.cpp | 4 | ||||
| -rw-r--r-- | src/core/ozone/platform_window_qt.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/core/ozone/BUILD.gn b/src/core/ozone/BUILD.gn index e0f9b8a41..61ca197e5 100644 --- a/src/core/ozone/BUILD.gn +++ b/src/core/ozone/BUILD.gn @@ -21,6 +21,7 @@ source_set("qt") { deps = [ "//base", + "//ui/base:buildflags", "//ui/ozone:ozone_base", "//ui/ozone/common", ] diff --git a/src/core/ozone/platform_window_qt.cpp b/src/core/ozone/platform_window_qt.cpp index 42af77774..74b95d9a2 100644 --- a/src/core/ozone/platform_window_qt.cpp +++ b/src/core/ozone/platform_window_qt.cpp @@ -80,8 +80,8 @@ bool PlatformWindowQt::CanDispatchEvent(const ui::PlatformEvent& /*ne*/) uint32_t PlatformWindowQt::DispatchEvent(const ui::PlatformEvent& native_event) { DispatchEventFromNativeUiEvent( - native_event, base::Bind(&PlatformWindowDelegate::DispatchEvent, - base::Unretained(delegate_))); + native_event, base::BindOnce(&PlatformWindowDelegate::DispatchEvent, + base::Unretained(delegate_))); return ui::POST_DISPATCH_STOP_PROPAGATION; } diff --git a/src/core/ozone/platform_window_qt.h b/src/core/ozone/platform_window_qt.h index c0dc8ccc3..2e5d189aa 100644 --- a/src/core/ozone/platform_window_qt.h +++ b/src/core/ozone/platform_window_qt.h @@ -71,7 +71,7 @@ public: void Minimize() override { } void Restore() override { } PlatformWindowState GetPlatformWindowState() const override { return PlatformWindowState::kUnknown; } - void SetCursor(PlatformCursor) override { } + void SetCursor(scoped_refptr<PlatformCursor>) override { } void MoveCursorTo(const gfx::Point&) override { } void ConfineCursorToBounds(const gfx::Rect&) override { } void SetRestoredBoundsInPixels(const gfx::Rect& bounds) override { } |