File tree Expand file tree Collapse file tree
SourceFiles/platform/linux Expand file tree Collapse file tree Original file line number Diff line number Diff line change 7979[submodule "Telegram/lib_webview "]
8080 path = Telegram/lib_webview
8181 url = https://github.com/desktop-app/lib_webview.git
82- [submodule "Telegram/lib_waylandshells "]
83- path = Telegram/lib_waylandshells
84- url = https://github.com/desktop-app/lib_waylandshells.git
8582[submodule "Telegram/ThirdParty/jemalloc "]
8683 path = Telegram/ThirdParty/jemalloc
8784 url = https://github.com/jemalloc/jemalloc
Original file line number Diff line number Diff line change @@ -18,9 +18,6 @@ endif()
1818add_subdirectory (lib_storage )
1919add_subdirectory (lib_lottie )
2020add_subdirectory (lib_qr )
21- if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
22- add_subdirectory (lib_waylandshells )
23- endif ()
2421add_subdirectory (lib_webrtc )
2522add_subdirectory (lib_webview )
2623add_subdirectory (codegen )
@@ -1472,7 +1469,6 @@ else()
14721469
14731470 target_link_libraries (Telegram
14741471 PRIVATE
1475- desktop-app::lib_waylandshells
14761472 desktop-app::external_wayland_client
14771473 )
14781474 endif ()
Original file line number Diff line number Diff line change @@ -490,10 +490,6 @@ namespace Platform {
490490void start () {
491491 LOG ((" Launcher filename: %1" ).arg (QGuiApplication::desktopFileName ()));
492492
493- #ifndef DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
494- qputenv (" QT_WAYLAND_SHELL_INTEGRATION" , " desktop-app-xdg-shell;xdg-shell" );
495- #endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
496-
497493 qputenv (" PULSE_PROP_application.name" , AppName.utf8 ());
498494 qputenv (" PULSE_PROP_application.icon_name" , GetIconName ().toLatin1 ());
499495
@@ -646,12 +642,6 @@ namespace ThirdParty {
646642void start () {
647643 LOG ((" Icon theme: %1" ).arg (QIcon::themeName ()));
648644 LOG ((" Fallback icon theme: %1" ).arg (QIcon::fallbackThemeName ()));
649-
650- #ifndef DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
651- InvokeQueued (qApp, [] {
652- qunsetenv (" QT_WAYLAND_SHELL_INTEGRATION" );
653- });
654- #endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
655645}
656646
657647void finish () {
Load diff This file was deleted.
You can’t perform that action at this time.
0 commit comments