diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2023-12-20 23:34:35 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2023-12-22 16:11:21 +0100 |
| commit | 2aa51e16208cf1fbabb1cf751fa101e9a1195888 (patch) | |
| tree | 2ac6529f747c5e8d6dc9f6759f323dc20bd32991 /src/window-lib | |
| parent | 6470c9831d2dd18445a7234aaaed173384f9b642 (diff) | |
Remove obsolete QT_VERSION_CHECKs
Change-Id: Ib5a13476a0819b789326651aa3425a4ffebe93b1
Pick-to: 6.7
Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
Diffstat (limited to 'src/window-lib')
| -rw-r--r-- | src/window-lib/waylandcompositor.cpp | 4 | ||||
| -rw-r--r-- | src/window-lib/waylandwindow.cpp | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/window-lib/waylandcompositor.cpp b/src/window-lib/waylandcompositor.cpp index 78d887f2..ead5ab12 100644 --- a/src/window-lib/waylandcompositor.cpp +++ b/src/window-lib/waylandcompositor.cpp @@ -108,11 +108,7 @@ void WindowSurface::close() if (m_topLevel) { m_topLevel->sendClose(); } else if (m_popup) { -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - QWaylandXdgPopupPrivate::get(m_popup)->send_popup_done(); -#else m_popup->sendPopupDone(); -#endif } else { qCWarning(LogGraphics) << "The Wayland surface" << this << "is not using the XDG Shell extension. Unable to send close signal."; } diff --git a/src/window-lib/waylandwindow.cpp b/src/window-lib/waylandwindow.cpp index af488f81..f0b6e818 100644 --- a/src/window-lib/waylandwindow.cpp +++ b/src/window-lib/waylandwindow.cpp @@ -29,11 +29,7 @@ WaylandWindow::WaylandWindow(Application *app, WindowSurface *surf) connect(surf, &WindowSurface::pong, this, &WaylandWindow::pongReceived); connect(m_surface, &QWaylandSurface::hasContentChanged, this, &WaylandWindow::onContentStateChanged); -#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) - connect(m_surface, &QWaylandSurface::sizeChanged, this, &Window::sizeChanged); -#else connect(m_surface, &QWaylandSurface::bufferSizeChanged, this, &Window::sizeChanged); -#endif m_pingTimer->setInterval(1000); m_pingTimer->setSingleShot(true); @@ -162,11 +158,7 @@ QString WaylandWindow::applicationId() const QSize WaylandWindow::size() const { -#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) - return m_surface->size(); -#else return m_surface->bufferSize(); -#endif } void WaylandWindow::resize(const QSize &newSize) |