void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get rid of lib_waylandshells

Browse source
This commit is contained in:
Ilya Fedin 2022-09-01 16:42:01 +04:00 • committed by John Preston
parent f874876b00
commit 38da0e086d
4 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -79,9 +79,6 @@
[submodule "Telegram/lib_webview"] [submodule "Telegram/lib_webview"]
path = Telegram/lib_webview path = Telegram/lib_webview
url = https://github.com/desktop-app/lib_webview.git 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"] [submodule "Telegram/ThirdParty/jemalloc"]
path = Telegram/ThirdParty/jemalloc path = Telegram/ThirdParty/jemalloc
url = https://github.com/jemalloc/jemalloc url = https://github.com/jemalloc/jemalloc

4
Telegram/CMakeLists.txt
View file

@ -18,9 +18,6 @@ endif()
add_subdirectory(lib_storage) add_subdirectory(lib_storage)
add_subdirectory(lib_lottie) add_subdirectory(lib_lottie)
add_subdirectory(lib_qr) 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_webrtc)
add_subdirectory(lib_webview) add_subdirectory(lib_webview)
add_subdirectory(codegen) add_subdirectory(codegen)
@ -1472,7 +1469,6 @@ else()
target_link_libraries(Telegram target_link_libraries(Telegram
PRIVATE PRIVATE
desktop-app::lib_waylandshells
desktop-app::external_wayland_client desktop-app::external_wayland_client
) )
endif() endif()

10
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View file

@ -490,10 +490,6 @@ namespace Platform {
void start() { void start() {
LOG(("Launcher filename: %1").arg(QGuiApplication::desktopFileName())); 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.name", AppName.utf8());
qputenv("PULSE_PROP_application.icon_name", GetIconName().toLatin1()); qputenv("PULSE_PROP_application.icon_name", GetIconName().toLatin1());
@ -646,12 +642,6 @@ namespace ThirdParty {
void start() { void start() {
LOG(("Icon theme: %1").arg(QIcon::themeName())); LOG(("Icon theme: %1").arg(QIcon::themeName()));
LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName())); 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() { void finish() {

1
Telegram/lib_waylandshells

@ -1 +0,0 @@
Subproject commit 271290b93c65b6fb634cb9c69bff97f51b74f3a7