Commit: d9f5e963086576d9ba7983749ece2e3d8036cc56 - Fs-scripts (git)

Commit MetaInfo

• Revision: d9f5e963086576d9ba7983749ece2e3d8036cc56 (tree)
• Zeit: 2023-05-20 17:55:35
• Autor: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

workaround available now for qtlocation using clang 15+ (probably AppleClang 14.0.3 is built using clang 15+?)

Ändern Zusammenfassung

• modified: Compile/lib/qtCompile/conf.lua

Diff

--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -2049,7 +2049,6 @@ conf.q5_15wx6g2 = {
 	]],
 }
 
--- note: remove skip qtlocation on 5.15.14
 conf.q5_15mal = {
 	name = "Qt5.15.9-macOS-Universal-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "5.15.9-4",
@@ -2084,8 +2083,6 @@ conf.q5_15mal = {
 		"MYSQL_LIBDIR=&MYSQLPREFIX&/lib/mariadb"
 		-make-tool
 		"make -j$PARALLELNUM"
-		-skip
-		qtlocation
 		-webengine-proprietary-codecs
 		QMAKE_APPLE_DEVICE_ARCHS="arm64 x86_64"
 	]],
@@ -2128,8 +2125,6 @@ conf.q5_15malnf = {
 		-make-tool
 		"make -j$PARALLELNUM"
 		-rpath
-		-skip
-		qtlocation
 		-webengine-proprietary-codecs
 		-no-framework
 		QMAKE_APPLE_DEVICE_ARCHS="arm64 x86_64"
@@ -2170,8 +2165,6 @@ conf.q5_15malsf = {
 		-make-tool
 		"make -j$PARALLELNUM"
 		-skip
-		qtlocation
-		-skip
 		qtwebengine
 		QMAKE_APPLE_DEVICE_ARCHS="arm64 x86_64"
 	]],