mo2/cmake_common
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/cmake_common.git synced 2026-07-27 14:06:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

build: resolved Qt 6.10 compatibility issues. (#43)

Browse Source
This commit is contained in:
Romeo Ahmed
2026-02-02 19:57:32 +01:00
committed by GitHub
parent d4a3edc745
commit 2bc6d1498d
2 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mo2_utils.cmake
+25 -8
View File
@@ -197,11 +197,14 @@ function(mo2_deploy_qt)
--verbose 0
--webenginewidgets
--websockets
--networkauth
--openglwidgets
--libdir dlls
--no-compiler-runtime)
if(MO2_QT_VERSION VERSION_LESS "6.10.0")
list(APPEND args --networkauth)
endif()
if(${DEPLOY_NOPLUGINS})
list(APPEND args --no-plugins)
else()
@@ -262,14 +265,28 @@ function(mo2_deploy_qt)
if(NOT ${DEPLOY_NOPLUGINS})
set(qtwebengine_process_exe $<IF:$<CONFIG:Debug>,QtWebEngineProcessd.exe,QtWebEngineProcess.exe>)
install(CODE "
file(RENAME \"${bin}/dlls/${qtwebengine_process_exe}\" \"${bin}/${qtwebengine_process_exe}\")
file(RENAME \"${bin}/qtplugins/platforms\" \"${bin}/platforms\")
file(RENAME \"${bin}/qtplugins/styles\" \"${bin}/styles\")
file(RENAME \"${bin}/qtplugins/imageformats\" \"${bin}/dlls/imageformats\")
file(RENAME \"${bin}/qtplugins/tls\" \"${bin}/dlls/tls\")
if(EXISTS \"${bin}/dlls/${qtwebengine_process_exe}\")
message(STATUS \"[MO2] Moving ${qtwebengine_process_exe} to root...\")
file(RENAME \"${bin}/dlls/${qtwebengine_process_exe}\" \"${bin}/${qtwebengine_process_exe}\")
endif()
foreach(_dir platforms styles)
if(EXISTS \"${bin}/qtplugins/\${_dir}\")
file(REMOVE_RECURSE \"${bin}/\${_dir}\")
file(RENAME \"${bin}/qtplugins/\${_dir}\" \"${bin}/\${_dir}\")
endif()
endforeach()
foreach(_dir imageformats tls)
if(EXISTS \"${bin}/qtplugins/\${_dir}\")
file(REMOVE_RECURSE \"${bin}/dlls/\${_dir}\")
file(RENAME \"${bin}/qtplugins/\${_dir}\" \"${bin}/dlls/\${_dir}\")
endif()
endforeach()
file(REMOVE_RECURSE \"${bin}/qtplugins\")
")
endif()
")
endif()
endfunction()
#! mo2_add_lupdate : generate .ts files from the given sources
mo2_versions.cmake
+7 -3
View File
@@ -33,9 +33,13 @@ message(STATUS "[MO2] Qt version: ${MO2_QT_VERSION} (${MO2_QT_VERSION_MAJOR}, ${
mo2_set_if_not_defined(MO2_PYTHON_VERSION "3.12")
# TODO: there is no prebuilt for 6.7.3, so we stay on 6.7.1 for now
mo2_set_if_not_defined(MO2_PYQT_VERSION "6.7.1")
mo2_set_if_not_defined(MO2_SIP_VERSION "6.8.6")
if (MO2_QT_VERSION_MAJOR EQUAL 6 AND MO2_QT_VERSION_MINOR EQUAL 10)
mo2_set_if_not_defined(MO2_PYQT_VERSION "6.10.2")
mo2_set_if_not_defined(MO2_SIP_VERSION "6.15.1")
else()
mo2_set_if_not_defined(MO2_PYQT_VERSION "6.7.1")
mo2_set_if_not_defined(MO2_SIP_VERSION "6.8.6")
endif()
message(STATUS "[MO2] Python version: ${MO2_PYTHON_VERSION}")
message(STATUS "[MO2] PyQt version: ${MO2_PYQT_VERSION}")