diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2020-07-03 14:13:25 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2020-07-06 10:39:07 +0200 |
| commit | c114e173ce2f47f8df2fb0ea35af0ede04354751 (patch) | |
| tree | 71d2577ca8fdfee76564de406709d41c2e85d024 /src/compositor/compositor_api/qwaylandcompositor.cpp | |
| parent | a60f91d1cebe41b7fdd96171fc19fa75662c6f66 (diff) | |
Remove checks for old Wayland versions
Now that the minimum libwayland version is 1.15, there is no point
in checking whether the version is greater than 1.10.
Task-number: QTBUG-73636
Change-Id: I75a97bec7e464aa6b04e21d1c23566d17ac7684a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandcompositor.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index ee38c628d..8878ce121 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -214,9 +214,7 @@ void QWaylandCompositorPrivate::init() emit q->socketNameChanged(socket_name); } -#if WAYLAND_VERSION_MAJOR >= 1 && (WAYLAND_VERSION_MAJOR != 1 || WAYLAND_VERSION_MINOR >= 10) connectToExternalSockets(); -#endif loop = wl_display_get_event_loop(display); @@ -308,7 +306,6 @@ void QWaylandCompositorPrivate::addPolishObject(QObject *object) } } -#if WAYLAND_VERSION_MAJOR >= 1 && (WAYLAND_VERSION_MAJOR != 1 || WAYLAND_VERSION_MINOR >= 10) void QWaylandCompositorPrivate::connectToExternalSockets() { // Clear out any backlog of user-supplied external socket descriptors @@ -318,7 +315,6 @@ void QWaylandCompositorPrivate::connectToExternalSockets() } externally_added_socket_fds.clear(); } -#endif void QWaylandCompositorPrivate::compositor_create_surface(wl_compositor::Resource *resource, uint32_t id) { @@ -642,15 +638,10 @@ QByteArray QWaylandCompositor::socketName() const */ void QWaylandCompositor::addSocketDescriptor(int fd) { -#if WAYLAND_VERSION_MAJOR >= 1 && (WAYLAND_VERSION_MAJOR != 1 || WAYLAND_VERSION_MINOR >= 10) Q_D(QWaylandCompositor); d->externally_added_socket_fds.append(fd); if (isCreated()) d->connectToExternalSockets(); -#else - Q_UNUSED(fd); - qWarning() << "QWaylandCompositor::addSocketDescriptor() does nothing on libwayland versions prior to 1.10.0"; -#endif } /*! |