From 38da0e086d7e77058845fd313d02592d8ccd385f Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 1 Sep 2022 16:42:01 +0400 Subject: [PATCH] Get rid of lib_waylandshells --- .gitmodules | 3 --- Telegram/CMakeLists.txt | 4 ---- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 10 ---------- Telegram/lib_waylandshells | 1 - 4 files changed, 18 deletions(-) delete mode 160000 Telegram/lib_waylandshells diff --git a/.gitmodules b/.gitmodules index 1d4d04f212..63b264efbb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -79,9 +79,6 @@ [submodule "Telegram/lib_webview"] path = Telegram/lib_webview url = https://github.com/desktop-app/lib_webview.git -[submodule "Telegram/lib_waylandshells"] - path = Telegram/lib_waylandshells - url = https://github.com/desktop-app/lib_waylandshells.git [submodule "Telegram/ThirdParty/jemalloc"] path = Telegram/ThirdParty/jemalloc url = https://github.com/jemalloc/jemalloc diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index a855f2f6f2..14a5b60209 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -18,9 +18,6 @@ endif() add_subdirectory(lib_storage) add_subdirectory(lib_lottie) add_subdirectory(lib_qr) -if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) - add_subdirectory(lib_waylandshells) -endif() add_subdirectory(lib_webrtc) add_subdirectory(lib_webview) add_subdirectory(codegen) @@ -1472,7 +1469,6 @@ else() target_link_libraries(Telegram PRIVATE - desktop-app::lib_waylandshells desktop-app::external_wayland_client ) endif() diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index f4e9211bdc..a96a85e963 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -490,10 +490,6 @@ namespace Platform { void start() { LOG(("Launcher filename: %1").arg(QGuiApplication::desktopFileName())); -#ifndef DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION - qputenv("QT_WAYLAND_SHELL_INTEGRATION", "desktop-app-xdg-shell;xdg-shell"); -#endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION - qputenv("PULSE_PROP_application.name", AppName.utf8()); qputenv("PULSE_PROP_application.icon_name", GetIconName().toLatin1()); @@ -646,12 +642,6 @@ namespace ThirdParty { void start() { LOG(("Icon theme: %1").arg(QIcon::themeName())); LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName())); - -#ifndef DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION - InvokeQueued(qApp, [] { - qunsetenv("QT_WAYLAND_SHELL_INTEGRATION"); - }); -#endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION } void finish() { diff --git a/Telegram/lib_waylandshells b/Telegram/lib_waylandshells deleted file mode 160000 index 271290b93c..0000000000 --- a/Telegram/lib_waylandshells +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 271290b93c65b6fb634cb9c69bff97f51b74f3a7