From dc29531d97a1c122df6b6fe23e045e78c59cdb4e Mon Sep 17 00:00:00 2001 From: MinyazevR <89993880+MinyazevR@users.noreply.github.com> Date: Wed, 10 Jul 2024 11:44:10 +0300 Subject: [PATCH] Temporary fix macOS-12 Qt5.12 build (#764) * Temporary fix macOS-12 Qt5.12 build * Change version --- azure-pipelines.yml | 2 +- global.pri | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2a1e3350..f0920559 100644 --- 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 index 60ec31de..c401bd2e 100644 --- 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 {