Commit: 36d31ac72365d2c6842e99258c4aa761b4214961 - Fs-scripts (git)

Commit MetaInfo

• Révision: 36d31ac72365d2c6842e99258c4aa761b4214961 (tree)
• l'heure: 2022-11-20 09:23:12
• Auteur: Fs <Fsu0413@vip....>
• Commiter: Fs

Message de Log

又TM白干了啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊

Change Summary

• modified: qt6_deploy_host.sh
• modified: qt6_deploy_host.vbs

Modification

--- a/qt6_deploy_host.sh
+++ b/qt6_deploy_host.sh
@@ -73,13 +73,7 @@ sed -i '' -e 's,^set(__qt_platform_initial_qt_host_path_cmake_dir[[:space:]].*$,
 
 sed -i '' -e '/^set(__qt_toolchain_initial_qt_host_path[[:space:]]*$/{N
 c\
-set(__qt_platform_initial_qt_host_path "${CMAKE_CURRENT_LIST_DIR}/../../../host")
-d
-}' "${PATH_TO_TARGET}/lib/cmake/Qt6/qt.toolchain.cmake"
-
-sed -i '' -e '/^set(__qt_platform_initial_qt_host_path_cmake_dir[[:space:]]*$/{N
-c\
-set(__qt_platform_initial_qt_host_path_cmake_dir "${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake")
+set(__qt_toolchain_initial_qt_host_path "${CMAKE_CURRENT_LIST_DIR}/../../../host")
 d
 }' "${PATH_TO_TARGET}/lib/cmake/Qt6/qt.toolchain.cmake"
 

--- a/qt6_deploy_host.vbs
+++ b/qt6_deploy_host.vbs
@@ -112,11 +112,8 @@ Do until qt_toolchain_cmakeold.AtEndOfStream
 	If Left(Trim(line), 49) = "set(__qt_toolchain_initial_qt_host_path_cmake_dir" Then
 		line = "set(__qt_toolchain_initial_qt_host_path_cmake_dir ""${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake"")"
 		qt_toolchain_cmakeold.ReadLine
-	ElseIf Left(Trim(line), 48) = "set(__qt_platform_initial_qt_host_path_cmake_dir" Then
-		line = "set(__qt_platform_initial_qt_host_path_cmake_dir ""${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake"")"
-		qt_toolchain_cmakeold.ReadLine
-	ElseIf Left(Trim(line), 38) = "set(__qt_platform_initial_qt_host_path" Then
-		line = "set(__qt_platform_initial_qt_host_path ""${CMAKE_CURRENT_LIST_DIR}/../../../host"")"
+	ElseIf Left(Trim(line), 39) = "set(__qt_toolchain_initial_qt_host_path" Then
+		line = "set(__qt_toolchain_initial_qt_host_path ""${CMAKE_CURRENT_LIST_DIR}/../../../host"")"
 		qt_toolchain_cmakeold.ReadLine
 	End If
 	qt_toolchain_cmake.WriteLine line