Use desktop-app::external_qt_static_plugins
This commit is contained in:
parent
902e0fc8fb
commit
596c7892c7
|
@ -60,6 +60,7 @@ PRIVATE
|
||||||
desktop-app::external_rlottie
|
desktop-app::external_rlottie
|
||||||
desktop-app::external_zlib
|
desktop-app::external_zlib
|
||||||
desktop-app::external_minizip
|
desktop-app::external_minizip
|
||||||
|
desktop-app::external_qt_static_plugins
|
||||||
desktop-app::external_qt
|
desktop-app::external_qt
|
||||||
desktop-app::external_qr_code_generator
|
desktop-app::external_qr_code_generator
|
||||||
desktop-app::external_crash_reports
|
desktop-app::external_crash_reports
|
||||||
|
@ -71,8 +72,6 @@ PRIVATE
|
||||||
if (LINUX)
|
if (LINUX)
|
||||||
target_link_libraries(Telegram
|
target_link_libraries(Telegram
|
||||||
PRIVATE
|
PRIVATE
|
||||||
desktop-app::external_nimf_qt5
|
|
||||||
desktop-app::external_qt5ct_support
|
|
||||||
desktop-app::external_xcb_screensaver
|
desktop-app::external_xcb_screensaver
|
||||||
desktop-app::external_xcb
|
desktop-app::external_xcb
|
||||||
desktop-app::external_glib
|
desktop-app::external_glib
|
||||||
|
@ -83,19 +82,11 @@ if (LINUX)
|
||||||
PRIVATE
|
PRIVATE
|
||||||
desktop-app::external_statusnotifieritem
|
desktop-app::external_statusnotifieritem
|
||||||
desktop-app::external_dbusmenu_qt
|
desktop-app::external_dbusmenu_qt
|
||||||
desktop-app::external_fcitx_qt5
|
|
||||||
desktop-app::external_fcitx5_qt5
|
|
||||||
desktop-app::external_hime_qt
|
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
|
|
||||||
target_link_libraries(Telegram
|
|
||||||
PRIVATE
|
|
||||||
desktop-app::external_materialdecoration
|
|
||||||
)
|
|
||||||
|
|
||||||
if (DESKTOP_APP_USE_PACKAGED
|
if (DESKTOP_APP_USE_PACKAGED
|
||||||
|
AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
|
||||||
AND Qt5WaylandClient_VERSION VERSION_LESS 5.13.0)
|
AND Qt5WaylandClient_VERSION VERSION_LESS 5.13.0)
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client)
|
pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client)
|
||||||
|
@ -105,7 +96,6 @@ if (LINUX)
|
||||||
${WAYLAND_CLIENT_INCLUDE_DIRS}
|
${WAYLAND_CLIENT_INCLUDE_DIRS}
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
|
||||||
|
|
||||||
if (NOT TDESKTOP_DISABLE_GTK_INTEGRATION)
|
if (NOT TDESKTOP_DISABLE_GTK_INTEGRATION)
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
|
@ -1100,7 +1090,6 @@ PRIVATE
|
||||||
mainwidget.h
|
mainwidget.h
|
||||||
mainwindow.cpp
|
mainwindow.cpp
|
||||||
mainwindow.h
|
mainwindow.h
|
||||||
qt_static_plugins.cpp
|
|
||||||
settings.cpp
|
settings.cpp
|
||||||
settings.h
|
settings.h
|
||||||
stdafx.h
|
stdafx.h
|
||||||
|
|
|
@ -1,63 +0,0 @@
|
||||||
/*
|
|
||||||
This file is part of Telegram Desktop,
|
|
||||||
the official desktop application for the Telegram messaging service.
|
|
||||||
|
|
||||||
For license and copyright information please follow this link:
|
|
||||||
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|
||||||
*/
|
|
||||||
#include <QtCore/QtPlugin>
|
|
||||||
|
|
||||||
#ifndef DESKTOP_APP_USE_PACKAGED
|
|
||||||
Q_IMPORT_PLUGIN(QWebpPlugin)
|
|
||||||
|
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
|
|
||||||
Q_IMPORT_PLUGIN(QJpegPlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QGifPlugin)
|
|
||||||
#endif // Qt 5.8.0
|
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
|
||||||
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
|
|
||||||
#elif defined Q_OS_MAC // Q_OS_WIN
|
|
||||||
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QGenericEnginePlugin)
|
|
||||||
#elif defined Q_OS_UNIX // Q_OS_WIN | Q_OS_MAC
|
|
||||||
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QGenericEnginePlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QSvgIconPlugin)
|
|
||||||
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
|
|
||||||
Q_IMPORT_PLUGIN(QConnmanEnginePlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QXdgDesktopPortalThemePlugin)
|
|
||||||
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
|
|
||||||
#ifndef DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
|
|
||||||
Q_IMPORT_PLUGIN(QWaylandEglClientBufferPlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QWaylandIviShellIntegrationPlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QWaylandWlShellIntegrationPlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QWaylandXdgShellIntegrationPlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QWaylandBradientDecorationPlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QWaylandEglPlatformIntegrationPlugin)
|
|
||||||
#endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
|
|
||||||
#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_UNIX
|
|
||||||
#endif // !DESKTOP_APP_USE_PACKAGED
|
|
||||||
|
|
||||||
#if defined Q_OS_UNIX && !defined Q_OS_MAC
|
|
||||||
#if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY
|
|
||||||
Q_IMPORT_PLUGIN(NimfInputContextPlugin)
|
|
||||||
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
|
|
||||||
Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QFcitx5PlatformInputContextPlugin)
|
|
||||||
Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
|
|
||||||
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
|
|
||||||
#ifndef DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
|
|
||||||
Q_IMPORT_PLUGIN(QWaylandMaterialDecorationPlugin)
|
|
||||||
#endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
|
|
||||||
#endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY
|
|
||||||
|
|
||||||
#if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES
|
|
||||||
Q_IMPORT_PLUGIN(Qt5CTPlatformThemePlugin)
|
|
||||||
Q_IMPORT_PLUGIN(Qt5CTStylePlugin)
|
|
||||||
#endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES
|
|
||||||
#endif // Q_OS_UNIX && !Q_OS_MAC
|
|
2
cmake
2
cmake
|
@ -1 +1 @@
|
||||||
Subproject commit 783efab5aa41efb2db8a162174e016a254021b7d
|
Subproject commit a81345a28d407fb5acd5267ec6afa1864f4e8d5b
|
Loading…
Reference in New Issue