diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-09 01:00:25 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-09 01:00:26 +0100 |
| commit | 6074ebf728668288e082cf7dca15de215cc0f653 (patch) | |
| tree | ddc25bb3fa460618353e873a8ac03db30f4950e2 /src/plugins/platforms/android/qandroidplatformwindow.h | |
| parent | 84bf4d90b7154940486d3c3969a81c259496e830 (diff) | |
| parent | 5e66ea373a581d7e62b829d0ffa7f84d754c7f8f (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I7be168303fc4fec5892f20f8dcbdf1bdfcd4986f
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformwindow.h')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformwindow.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformwindow.h b/src/plugins/platforms/android/qandroidplatformwindow.h index f83ad7bea3..d8eb6b7b7f 100644 --- a/src/plugins/platforms/android/qandroidplatformwindow.h +++ b/src/plugins/platforms/android/qandroidplatformwindow.h @@ -70,11 +70,9 @@ public: QAndroidPlatformScreen *platformScreen() const; - QMargins safeAreaMargins() const override; - void propagateSizeHints() override; void requestActivateWindow() override; - void updateSystemUiVisibility(); + void updateStatusBarVisibility(); inline bool isRaster() const { if (isForeignWindow()) return false; |