From 143b9682a43575a4a9ec2bc1bbe893cb23250496 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 12 Oct 2020 16:04:54 +0400 Subject: [PATCH] Get rid of lxqt-qtplugin It is stil impossible to build it statically and it seems that reading icon theme from gtk is pretty enough --- .gitmodules | 6 ------ Telegram/CMakeLists.txt | 8 -------- Telegram/SourceFiles/qt_static_plugins.cpp | 7 ------- Telegram/ThirdParty/libqtxdg | 1 - Telegram/ThirdParty/lxqt-qtplugin | 1 - 5 files changed, 23 deletions(-) delete mode 160000 Telegram/ThirdParty/libqtxdg delete mode 160000 Telegram/ThirdParty/lxqt-qtplugin diff --git a/.gitmodules b/.gitmodules index 1ce899afc..d4624361b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -82,12 +82,6 @@ [submodule "Telegram/ThirdParty/qt5ct"] path = Telegram/ThirdParty/qt5ct url = https://github.com/desktop-app/qt5ct.git -[submodule "Telegram/ThirdParty/lxqt-qtplugin"] - path = Telegram/ThirdParty/lxqt-qtplugin - url = https://github.com/lxqt/lxqt-qtplugin.git -[submodule "Telegram/ThirdParty/libqtxdg"] - path = Telegram/ThirdParty/libqtxdg - url = https://github.com/lxqt/libqtxdg.git [submodule "Telegram/ThirdParty/fcitx5-qt"] path = Telegram/ThirdParty/fcitx5-qt url = https://github.com/fcitx/fcitx5-qt.git diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 7d896a91b..19e767410 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -112,14 +112,6 @@ if (LINUX) ) if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) - # conflicts with Qt static link - if (DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES) - target_link_libraries(Telegram - PRIVATE - desktop-app::external_lxqt_qtplugin - ) - endif() - target_link_libraries(Telegram PRIVATE desktop-app::external_statusnotifieritem diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp index c5f7473ce..5dffd6a7a 100644 --- a/Telegram/SourceFiles/qt_static_plugins.cpp +++ b/Telegram/SourceFiles/qt_static_plugins.cpp @@ -62,11 +62,4 @@ Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin) Q_IMPORT_PLUGIN(Qt5CTPlatformThemePlugin) Q_IMPORT_PLUGIN(Qt5CTStylePlugin) #endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES - -// conflicts with Qt static link -#ifdef DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES -#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION -Q_IMPORT_PLUGIN(LXQtPlatformThemePlugin) -#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION -#endif // DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES #endif // Q_OS_UNIX && !Q_OS_MAC diff --git a/Telegram/ThirdParty/libqtxdg b/Telegram/ThirdParty/libqtxdg deleted file mode 160000 index ae412d30c..000000000 --- a/Telegram/ThirdParty/libqtxdg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ae412d30c695f3d4ce9b79feabc937eefde5537b diff --git a/Telegram/ThirdParty/lxqt-qtplugin b/Telegram/ThirdParty/lxqt-qtplugin deleted file mode 160000 index 418162b36..000000000 --- a/Telegram/ThirdParty/lxqt-qtplugin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 418162b36eff24fe70fd9195c60fae7276afa286