kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Fix build with Qt 6.2 on macOS.

Browse source
This commit is contained in:
John Preston 2021-10-21 19:45:43 +04:00
parent 02993a6c82
commit 57ccb6c03c
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
external/qt/qt6/CMakeLists.txt vendored
View file

@ -119,7 +119,6 @@ else()
endif() endif()
set(common_qt_libs set(common_qt_libs
plugins/tls/${qt_lib_prefix}qopensslbackend
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
@ -142,8 +141,9 @@ else()
${common_qt_libs} ${common_qt_libs}
lib/${qt_lib_prefix}Qt6WindowsUIAutomationSupport lib/${qt_lib_prefix}Qt6WindowsUIAutomationSupport
lib/${qt_lib_prefix}qtmain lib/${qt_lib_prefix}qtmain
lib/${qt_lib_prefix}qtfreetype lib/${qt_lib_prefix}Qt6BundledFreetype
plugins/platforms/${qt_lib_prefix}qwindows plugins/platforms/${qt_lib_prefix}qwindows
plugins/tls/${qt_lib_prefix}qopensslbackend
) )
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}")
@ -156,14 +156,16 @@ else()
elseif (APPLE) elseif (APPLE)
set(qt_libs set(qt_libs
${common_qt_libs} ${common_qt_libs}
lib/${qt_lib_prefix}Qt6GraphicsSupport lib/${qt_lib_prefix}Qt6BundledFreetype
lib/${qt_lib_prefix}Qt6ClipboardSupport
lib/${qt_lib_prefix}qtfreetype
plugins/platforms/${qt_lib_prefix}qcocoa plugins/platforms/${qt_lib_prefix}qcocoa
plugins/tls/${qt_lib_prefix}qsecuretransportbackend
) )
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}")
endforeach() endforeach()
list(APPEND qt_libs_list
"${qt_loc}/lib/${qt_lib_objects}/QCocoaIntegrationPlugin_resources_1/.rcc/qrc_qcocoaresources.cpp.o"
)
else() else()
set(qt_libs_dbus) set(qt_libs_dbus)
set(qt_libs_dbus_plugins) set(qt_libs_dbus_plugins)
@ -196,6 +198,7 @@ else()
${qt_libs_waylandclient_plugins} ${qt_libs_waylandclient_plugins}
plugins/platformthemes/${qt_lib_prefix}qgtk3 plugins/platformthemes/${qt_lib_prefix}qgtk3
plugins/platforms/${qt_lib_prefix}qxcb plugins/platforms/${qt_lib_prefix}qxcb
plugins/tls/${qt_lib_prefix}qopensslbackend
plugins/xcbglintegrations/${qt_lib_prefix}qxcb-egl-integration plugins/xcbglintegrations/${qt_lib_prefix}qxcb-egl-integration
plugins/xcbglintegrations/${qt_lib_prefix}qxcb-glx-integration plugins/xcbglintegrations/${qt_lib_prefix}qxcb-glx-integration
plugins/iconengines/${qt_lib_prefix}qsvgicon plugins/iconengines/${qt_lib_prefix}qsvgicon

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

@ -9,7 +9,13 @@ https://github.com/desktop-app/legal/blob/master/LEGAL
#ifndef DESKTOP_APP_USE_PACKAGED #ifndef DESKTOP_APP_USE_PACKAGED
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#ifdef Q_OS_MAC
Q_IMPORT_PLUGIN(QSecureTransportBackend)
#else // Q_OS_MAC
Q_IMPORT_PLUGIN(QTlsBackendOpenSSL) Q_IMPORT_PLUGIN(QTlsBackendOpenSSL)
#endif // Q_OS_MAC
#else // Qt >= 6.0.0 #else // Qt >= 6.0.0
Q_IMPORT_PLUGIN(QGenericEnginePlugin) Q_IMPORT_PLUGIN(QGenericEnginePlugin)
#endif // Qt < 6.0.0 #endif // Qt < 6.0.0