Update submodules on '5.11.0' in qt5

Change-Id: Ibd0c5cf8c72518bd5bb608dfe3c7946f6bc2d121 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2026-01-09 16:36:35 +08:00 · 2018-05-16 14:32:45 +00:00 · 2018-05-16 09:14:15 +00:00 · 2018-05-15 11:00:36 +00:00 · 2018-05-14 12:30:59 +00:00 · 2018-05-09 12:05:12 +00:00
9 changed files with 20 additions and 7 deletions
--- 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
--- 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"
+}
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	081601ba0e	Update submodules on '5.11.0' in qt5 Change-Id: Ibd0c5cf8c72518bd5bb608dfe3c7946f6bc2d121 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-05-16 14:32:45 +00:00
Qt Submodule Update Bot	e7a999ce4d	Update submodules on '5.11.0' in qt5 Change-Id: I4de0d56b6bd15782984f67e4107b7ec9a90731e4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-05-16 09:14:15 +00:00
Qt Submodule Update Bot	d7b03bf0bc	Update submodules on '5.11.0' in qt5 Change-Id: I13dae70cd516b623c9e9039a6c8b71de84e88459 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-05-15 11:00:36 +00:00
Simon Hausmann	d75411d6e5	Fix linking of qdoc against an external libclang (part 1) 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 <jedrzej.nowacki@qt.io>	2018-05-14 12:30:59 +00:00
Qt Submodule Update Bot	b1b04fcb1a	Update submodules on '5.11.0' in qt5 Change-Id: Ia6d3ee44db368765612cea543952878499889d6b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-05-09 12:05:12 +00:00