From 1d24d29afa1ca3c86f012d5c5a55a6489423bd71 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 1 Oct 2020 17:22:39 +0400 Subject: [PATCH] Little cleanup for Linux platform code & build CheckCXXSourceCompiles is not needed anymore Material wayland decorations could be checked just with IsQtPluginsBundled --- Telegram/CMakeLists.txt | 1 - Telegram/SourceFiles/platform/linux/specific_linux.cpp | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 8e3ea3e3cf..f828f262ee 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -21,7 +21,6 @@ add_subdirectory(lib_qr) add_subdirectory(lib_webrtc) add_subdirectory(codegen) -include(CheckCXXSourceCompiles) include(lib_ui/cmake/generate_styles.cmake) include(cmake/generate_numbers.cmake) diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index ba82674372..eb0394e94b 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -1342,15 +1342,11 @@ void start() { "this may lead to font issues."); #endif // DESKTOP_APP_USE_PACKAGED_FONTS - if(IsStaticBinary() - || InAppImage() - || InFlatpak() - || InSnap() - || IsQtPluginsBundled()) { + if (IsQtPluginsBundled()) { qputenv("QT_WAYLAND_DECORATION", "material"); } - if((IsStaticBinary() + if ((IsStaticBinary() || InAppImage() || IsQtPluginsBundled()) // it is handled by Qt for flatpak and snap