kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Get rid of lxqt-qtplugin

Browse source 
It is stil impossible to build it statically and it seems that reading icon theme from gtk is pretty enough
This commit is contained in:
Ilya Fedin 2020-10-12 16:04:54 +04:00 • committed by John Preston
parent 00c962e557
commit 143b9682a4
5 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -82,12 +82,6 @@
[submodule "Telegram/ThirdParty/qt5ct"] [submodule "Telegram/ThirdParty/qt5ct"]
path = Telegram/ThirdParty/qt5ct path = Telegram/ThirdParty/qt5ct
url = https://github.com/desktop-app/qt5ct.git 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"] [submodule "Telegram/ThirdParty/fcitx5-qt"]
path = Telegram/ThirdParty/fcitx5-qt path = Telegram/ThirdParty/fcitx5-qt
url = https://github.com/fcitx/fcitx5-qt.git url = https://github.com/fcitx/fcitx5-qt.git

8
Telegram/CMakeLists.txt
View file

@ -112,14 +112,6 @@ if (LINUX)
) )
if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) 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 target_link_libraries(Telegram
PRIVATE PRIVATE
desktop-app::external_statusnotifieritem desktop-app::external_statusnotifieritem

7
Telegram/SourceFiles/qt_static_plugins.cpp
View file

@ -62,11 +62,4 @@ Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
Q_IMPORT_PLUGIN(Qt5CTPlatformThemePlugin) Q_IMPORT_PLUGIN(Qt5CTPlatformThemePlugin)
Q_IMPORT_PLUGIN(Qt5CTStylePlugin) Q_IMPORT_PLUGIN(Qt5CTStylePlugin)
#endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES #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 #endif // Q_OS_UNIX && !Q_OS_MAC

1
Telegram/ThirdParty/libqtxdg vendored

@ -1 +0,0 @@
Subproject commit ae412d30c695f3d4ce9b79feabc937eefde5537b

1
Telegram/ThirdParty/lxqt-qtplugin vendored

@ -1 +0,0 @@
Subproject commit 418162b36eff24fe70fd9195c60fae7276afa286