• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#windowsobjective-ccocoaqt誰得pythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revisionb320f3d17e6ddc9f7ec11d7fad595d273260504d (tree)
Time2022-11-20 07:32:05
AuthorFs <Fsu0413@vip....>
CommiterFs

Log Message

怎么还是不对

Change Summary

Incremental Difference

--- a/qt6_deploy_host.sh
+++ b/qt6_deploy_host.sh
@@ -82,3 +82,9 @@ c\
8282 set(__qt_platform_initial_qt_host_path_cmake_dir "${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake")
8383 d
8484 }' "${PATH_TO_TARGET}/lib/cmake/Qt6/qt.toolchain.cmake"
85+
86+sed -i '' -e '/^set(__qt_toolchain_initial_qt_host_path_cmake_dir[[:space:]]*$/{N
87+c\
88+set(__qt_toolchain_initial_qt_host_path_cmake_dir "${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake")
89+d
90+}' "${PATH_TO_TARGET}/lib/cmake/Qt6/qt.toolchain.cmake"
--- a/qt6_deploy_host.vbs
+++ b/qt6_deploy_host.vbs
@@ -107,12 +107,17 @@ Set qt_toolchain_cmakeold = fso.OpenTextFile(PATH_TO_TARGET & "\lib\cmake\Qt6\qt
107107
108108 Do until qt_toolchain_cmakeold.AtEndOfStream
109109 line = qt_toolchain_cmakeold.ReadLine
110- If Left(Trim(line), 48) = "set(__qt_platform_initial_qt_host_path_cmake_dir" Then
110+
111+ ' Qt 6.2.4 intentionally put the path to next line. It should be skipped.
112+ If Left(Trim(line), 49) = "set(__qt_toolchain_initial_qt_host_path_cmake_dir" Then
113+ line = "set(__qt_toolchain_initial_qt_host_path_cmake_dir ""${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake"")"
114+ qt_toolchain_cmakeold.ReadLine
115+ ElseIf Left(Trim(line), 48) = "set(__qt_platform_initial_qt_host_path_cmake_dir" Then
111116 line = "set(__qt_platform_initial_qt_host_path_cmake_dir ""${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake"")"
112117 qt_toolchain_cmakeold.ReadLine
113118 ElseIf Left(Trim(line), 38) = "set(__qt_platform_initial_qt_host_path" Then
114119 line = "set(__qt_platform_initial_qt_host_path ""${CMAKE_CURRENT_LIST_DIR}/../../../host"")"
115- qt_toolchain_cmakeold.ReadLine ' Qt 6.2.4 intentionally put the path to next line. It should be skipped.
120+ qt_toolchain_cmakeold.ReadLine
116121 End If
117122 qt_toolchain_cmake.WriteLine line
118123 Loop