Temporary fix macOS-12 Qt5.12 build (#764)

* Temporary fix macOS-12 Qt5.12 build * Change version
trikset · Jul 10, 2024 · dc29531 · dc29531
1 parent 9a0a66f
commit dc29531
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -33,7 +33,7 @@ jobs:
           imageName: 'macOS-12'
           QMAKE_EXTRA: "CONFIG+=tests CONFIG+=precompile_header CONFIG+=sanitize_address CONFIG+=sanitize_undefined CONFIG+=sanitizer CONFIG+=force_debug_info CONFIG+=trik_nopython"
           TRIK_PYTHON3_VERSION_MINOR: 10
-          TRIK_QT_VERSION: 5.15
+          TRIK_QT_VERSION: 5.12
 
     pool:
       vmImage: $(imageName)

diff --git a/global.pri b/global.pri
@@ -264,15 +264,13 @@ clang {
 		-cxx-isystem$$shell_quote($$[QT_INSTALL_HEADERS]) \
 		--system-header-prefix=$$shell_quote($$[QT_INSTALL_LIBS]) \
 
-
-#	for(module, QT) {
-#	    equals(module, "testlib"): module = test
-#	    moduleList = $$split(module, )
-#	    SYSTEM_INCLUDE_PREFIX_OPTION += \
-#		-system-header-prefix=$$shell_quote($$[QT_INSTALL_LIBS]/Qt$$upper(\
-#			      $$take_first(moduleList))$$join(moduleList, )).framework/Headers/
-#	}
-#	unset(moduleList)
+	for(module, QT) {
+	    equals(module, "testlib"): module = test
+	    moduleList = $$split(module, )
+	    SYSTEM_INCLUDE_PREFIX_OPTION += \
+		--system-header-prefix=Qt$$upper($$take_first(moduleList))$$join(moduleList, )
+	}
+	unset(moduleList)
 }
 
 gcc {