kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

QGenericEnginePlugin is available everywhere

Browse source 
So link it everywhere
This commit is contained in:
Ilya Fedin 2021-09-22 22:32:45 +04:00 • committed by John Preston
parent ed9b0e82d6
commit 1dacc0ac4f
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
external/qt/CMakeLists.txt vendored
View file

@ -131,6 +131,7 @@ else()
endif() endif()
set(common_qt_libs set(common_qt_libs
plugins/bearer/${qt_lib_prefix}qgenericbearer
plugins/imageformats/${qt_lib_prefix}qwebp plugins/imageformats/${qt_lib_prefix}qwebp
plugins/imageformats/${qt_lib_prefix}qgif plugins/imageformats/${qt_lib_prefix}qgif
plugins/imageformats/${qt_lib_prefix}qjpeg plugins/imageformats/${qt_lib_prefix}qjpeg
@ -175,7 +176,6 @@ else()
lib/${qt_lib_prefix}qtfreetype lib/${qt_lib_prefix}qtfreetype
lib/${qt_lib_prefix}qtpcre2 lib/${qt_lib_prefix}qtpcre2
plugins/platforms/${qt_lib_prefix}qcocoa plugins/platforms/${qt_lib_prefix}qcocoa
plugins/bearer/${qt_lib_prefix}qgenericbearer
) )
foreach (lib ${qt_libs}) foreach (lib ${qt_libs})
list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}") list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
@ -228,7 +228,6 @@ else()
lib/${qt_lib_prefix}Qt5EdidSupport lib/${qt_lib_prefix}Qt5EdidSupport
lib/${qt_lib_prefix}Qt5XkbCommonSupport lib/${qt_lib_prefix}Qt5XkbCommonSupport
${qt_libs_dbus_support} ${qt_libs_dbus_support}
plugins/bearer/${qt_lib_prefix}qgenericbearer
${qt_libs_dbus_bearers} ${qt_libs_dbus_bearers}
${qt_libs_waylandclient} ${qt_libs_waylandclient}
lib/${qt_lib_prefix}Qt5ServiceSupport lib/${qt_lib_prefix}Qt5ServiceSupport

3
external/qt/qt_static_plugins/qt_static_plugins.cpp vendored
View file

@ -8,6 +8,7 @@ https://github.com/desktop-app/legal/blob/master/LEGAL
#include <QtCore/QtPlugin> #include <QtCore/QtPlugin>
#ifndef DESKTOP_APP_USE_PACKAGED #ifndef DESKTOP_APP_USE_PACKAGED
Q_IMPORT_PLUGIN(QGenericEnginePlugin)
Q_IMPORT_PLUGIN(QWebpPlugin) Q_IMPORT_PLUGIN(QWebpPlugin)
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
@ -19,12 +20,10 @@ Q_IMPORT_PLUGIN(QGifPlugin)
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
#elif defined Q_OS_MAC // Q_OS_WIN #elif defined Q_OS_MAC // Q_OS_WIN
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
Q_IMPORT_PLUGIN(QGenericEnginePlugin)
#elif defined Q_OS_UNIX // Q_OS_WIN | Q_OS_MAC #elif defined Q_OS_UNIX // Q_OS_WIN | Q_OS_MAC
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
Q_IMPORT_PLUGIN(QXcbEglIntegrationPlugin) Q_IMPORT_PLUGIN(QXcbEglIntegrationPlugin)
Q_IMPORT_PLUGIN(QXcbGlxIntegrationPlugin) Q_IMPORT_PLUGIN(QXcbGlxIntegrationPlugin)
Q_IMPORT_PLUGIN(QGenericEnginePlugin)
Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin) Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
Q_IMPORT_PLUGIN(QSvgIconPlugin) Q_IMPORT_PLUGIN(QSvgIconPlugin)
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION