From d75411d6e560fcec1ab36395e88b1baf26c4cb69 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 14 May 2018 11:06:05 +0200 Subject: Fix linking of qdoc against an external libclang (part 1) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the qt5 part of the fix for the task. For the special version of libclang we hacked together that allows static linkage, set an environment variable that the mighty qdoc build system can utilize to activate the release packaging specific linkage. Change-Id: Ie340955214585329fe8fd3bc790e3cd6c6be42f9 Task-number: QTBUG-68178 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/unix/libclang.sh | 7 +++++++ coin/provisioning/common/windows/libclang.ps1 | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 53b9dfda..900671e6 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -41,6 +41,7 @@ set -e source "${BASH_SOURCE%/*}/check_and_set_proxy.sh" +source "${BASH_SOURCE%/*}/SetEnvVar.sh" BASEDIR=$(dirname "$0") . $BASEDIR/../shared/sw_versions.txt @@ -68,3 +69,9 @@ sudo mv /tmp/libclang $destination echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile echo "libClang = $version" >> ~/versions.txt + +if [ "$version" == "6.0" ]; then + # This is a hacked static build of libclang which requires special + # handling on the qdoc side. + SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1" +fi diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 5ba0a0aa..db277134 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -86,3 +86,9 @@ if ( $setDefault ) { } Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_") Write-Output "libClang = $libclang_version" >> ~/versions.txt + +if ( $libclang_version -eq "60" ) { + # This is a hacked static build of libclang which requires special + # handling on the qdoc side. + Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1" +} -- cgit v1.2.3 From d7b03bf0bcc501ba12c61a2a5ed2dfb02e2b80b5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 15 May 2018 06:10:15 +0300 Subject: Update submodules on '5.11.0' in qt5 Change-Id: I13dae70cd516b623c9e9039a6c8b71de84e88459 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdoc | 2 +- qttools | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index a7863a58..6eef81ee 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a7863a58545a6c59eaf16f36905efcbf0e4f94f9 +Subproject commit 6eef81ee1c82f934e14d47047d8b6103b8755321 diff --git a/qtdoc b/qtdoc index 63f18077..8a0244d3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 63f18077b2e8b4045c92248e86ed1ee2122cbd75 +Subproject commit 8a0244d3f46c1eb9904d9da7e741bb2e05ca3f3d diff --git a/qttools b/qttools index 9894e604..36e7b192 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9894e604dff2bf9fe9961b475a678938316154f1 +Subproject commit 36e7b1925e2ff2df167280eb3592b99697a1234d -- cgit v1.2.3 From e7a999ce4d2c6c1b7833dc50d1186ee4bfe642b9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 16 May 2018 12:12:10 +0300 Subject: Update submodules on '5.11.0' in qt5 Change-Id: I4de0d56b6bd15782984f67e4107b7ec9a90731e4 Reviewed-by: Jani Heikkinen --- qtqa | 2 +- qttools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtqa b/qtqa index 46daf8aa..79f009af 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 46daf8aac235107d0c77fe3a887ecb73f85b4159 +Subproject commit 79f009afd8ee0ad1c032f2235e09971ac1b5c376 diff --git a/qttools b/qttools index 36e7b192..a42d3f2a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 36e7b1925e2ff2df167280eb3592b99697a1234d +Subproject commit a42d3f2ac4b910ecc910ff144191cb729a745c9a -- cgit v1.2.3 From 081601ba0e368dc99c5dc0333b65584764f43fc9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 16 May 2018 17:32:03 +0300 Subject: Update submodules on '5.11.0' in qt5 Change-Id: Ibd0c5cf8c72518bd5bb608dfe3c7946f6bc2d121 Reviewed-by: Jani Heikkinen --- qtdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtdoc b/qtdoc index 8a0244d3..0d097a69 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8a0244d3f46c1eb9904d9da7e741bb2e05ca3f3d +Subproject commit 0d097a6995be7498b67b1586f8b2ebdc2cef26a3 -- cgit v1.2.3