diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index 93d475b..935c144 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -131,6 +131,7 @@ else() endif() set(common_qt_libs + plugins/bearer/${qt_lib_prefix}qgenericbearer plugins/imageformats/${qt_lib_prefix}qwebp plugins/imageformats/${qt_lib_prefix}qgif plugins/imageformats/${qt_lib_prefix}qjpeg @@ -175,7 +176,6 @@ else() lib/${qt_lib_prefix}qtfreetype lib/${qt_lib_prefix}qtpcre2 plugins/platforms/${qt_lib_prefix}qcocoa - plugins/bearer/${qt_lib_prefix}qgenericbearer ) foreach (lib ${qt_libs}) 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}Qt5XkbCommonSupport ${qt_libs_dbus_support} - plugins/bearer/${qt_lib_prefix}qgenericbearer ${qt_libs_dbus_bearers} ${qt_libs_waylandclient} lib/${qt_lib_prefix}Qt5ServiceSupport diff --git a/external/qt/qt_static_plugins/qt_static_plugins.cpp b/external/qt/qt_static_plugins/qt_static_plugins.cpp index 4ed1a8f..9bbb617 100644 --- a/external/qt/qt_static_plugins/qt_static_plugins.cpp +++ b/external/qt/qt_static_plugins/qt_static_plugins.cpp @@ -8,6 +8,7 @@ https://github.com/desktop-app/legal/blob/master/LEGAL #include #ifndef DESKTOP_APP_USE_PACKAGED +Q_IMPORT_PLUGIN(QGenericEnginePlugin) Q_IMPORT_PLUGIN(QWebpPlugin) #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) @@ -19,12 +20,10 @@ Q_IMPORT_PLUGIN(QGifPlugin) 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(QXcbEglIntegrationPlugin) Q_IMPORT_PLUGIN(QXcbGlxIntegrationPlugin) -Q_IMPORT_PLUGIN(QGenericEnginePlugin) Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin) Q_IMPORT_PLUGIN(QSvgIconPlugin) #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION