diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 6ffc7d8975..b4475a1f2e 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -127,7 +127,7 @@ PRIVATE desktop-app::external_openal ) -if (LINUX AND DESKTOP_APP_USE_PACKAGED) +if (LINUX AND DESKTOP_APP_USE_PACKAGED AND Qt5WaylandClient_VERSION VERSION_LESS 5.13.0) find_package(PkgConfig REQUIRED) pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client) diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index 008de8bf8a..6fd2edc52b 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -41,7 +41,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include + +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) && !defined DESKTOP_APP_QT_PATCHED #include +#endif // Qt < 5.13 && !DESKTOP_APP_QT_PATCHED #include #include @@ -463,6 +466,7 @@ uint XCBMoveResizeFromEdges(Qt::Edges edges) { return 0; } +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) && !defined DESKTOP_APP_QT_PATCHED enum wl_shell_surface_resize WlResizeFromEdges(Qt::Edges edges) { if (edges == (Qt::TopEdge | Qt::LeftEdge)) return WL_SHELL_SURFACE_RESIZE_TOP_LEFT; @@ -483,6 +487,7 @@ enum wl_shell_surface_resize WlResizeFromEdges(Qt::Edges edges) { return WL_SHELL_SURFACE_RESIZE_NONE; } +#endif // Qt < 5.13 && !DESKTOP_APP_QT_PATCHED bool StartXCBMoveResize(QWindow *window, int edges) { const auto native = QGuiApplication::platformNativeInterface();