From 4e78f559bec9de1c0cfdc79d56d65f4579f78611 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Fri, 8 May 2020 17:48:30 +0200 Subject: [PATCH] Remove uses of QScreen::orientationUpdateMask It has been removed in qtbase 3e12951c0b35041920989d6089ddb6c2f5c2d3d1. Task-number: QTBUG-35427 Task-number: QTBUG-38576 Task-number: QTBUG-44569 Task-number: QTBUG-51012 Task-number: QTBUG-83055 Change-Id: I3ec0907185b237c329f4ec34148b19c5a7706c22 Reviewed-by: Liang Qi --- src/plugins/platforms/wayland/qwaylandscreen.cpp | 10 ---------- src/plugins/platforms/wayland/qwaylandscreen_p.h | 2 -- src/plugins/platforms/wayland/qwaylandwindow.cpp | 2 -- 3 files changed, 14 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylandscreen.cpp b/src/plugins/platforms/wayland/qwaylandscreen.cpp index 6cb337de388..854f3b08212 100644 --- a/src/plugins/platforms/wayland/qwaylandscreen.cpp +++ b/src/plugins/platforms/wayland/qwaylandscreen.cpp @@ -186,16 +186,6 @@ QList QWaylandScreen::virtualSiblings() const return list; } -void QWaylandScreen::setOrientationUpdateMask(Qt::ScreenOrientations mask) -{ - const auto allWindows = QGuiApplication::allWindows(); - for (QWindow *window : allWindows) { - QWaylandWindow *w = static_cast(window->handle()); - if (w && w->waylandScreen() == this) - w->setOrientationMask(mask); - } -} - Qt::ScreenOrientation QWaylandScreen::orientation() const { return m_orientation; diff --git a/src/plugins/platforms/wayland/qwaylandscreen_p.h b/src/plugins/platforms/wayland/qwaylandscreen_p.h index df1c94f248e..404d0f1ecbf 100644 --- a/src/plugins/platforms/wayland/qwaylandscreen_p.h +++ b/src/plugins/platforms/wayland/qwaylandscreen_p.h @@ -96,8 +96,6 @@ public: QDpi logicalDpi() const override; QList virtualSiblings() const override; - void setOrientationUpdateMask(Qt::ScreenOrientations mask) override; - Qt::ScreenOrientation orientation() const override; int scale() const; qreal devicePixelRatio() const override; diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index 70ba132e83d..e342c04203e 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.cpp +++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp @@ -183,8 +183,6 @@ void QWaylandWindow::initWindow() if (mDisplay->compositorVersion() >= 3) mSurface->set_buffer_scale(scale()); - if (QScreen *s = window()->screen()) - setOrientationMask(s->orientationUpdateMask()); setWindowFlags(window()->flags()); if (window()->geometry().isEmpty()) setGeometry_helper(QRect(QPoint(), QSize(500,500)));