diff options
author | Simo Fält <simo.falt@qt.io> | 2021-04-29 13:30:35 +0300 |
---|---|---|
committer | Simo Fält <simo.falt@qt.io> | 2021-04-29 13:32:33 +0300 |
commit | 9e385191b1b80fd8a01ee6d814d9225d0aec213f (patch) | |
tree | f68650e35321a268d939688508a8d2fc50433f0d | |
parent | 5a8d37b64d18740ef6d4ff182f0127a749e1c15d (diff) | |
parent | 415527935e4605f44239165c0018ce9b8ca14970 (diff) |
Merge commit '415527935e4605f44239165c0018ce9b8ca14970' into pyside6.0
Change-Id: I17ebe2f4c1e04dde7401c0a8a0afeac1dcd93915
-rwxr-xr-x | coin/provisioning/common/macos/nodejs.sh | 4 | ||||
-rw-r--r-- | coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh | 2 | ||||
m--------- | qt3d | 0 | ||||
m--------- | qt5compat | 0 | ||||
m--------- | qtbase | 0 | ||||
m--------- | qtcoap | 0 | ||||
m--------- | qtdeclarative | 0 | ||||
m--------- | qtdoc | 0 | ||||
m--------- | qtimageformats | 0 | ||||
m--------- | qtmqtt | 0 | ||||
m--------- | qtnetworkauth | 0 | ||||
m--------- | qtopcua | 0 | ||||
m--------- | qtqa | 0 | ||||
m--------- | qtquick3d | 0 | ||||
m--------- | qtquickcontrols2 | 0 | ||||
m--------- | qtquicktimeline | 0 | ||||
m--------- | qtshadertools | 0 | ||||
m--------- | qtsvg | 0 | ||||
m--------- | qttools | 0 | ||||
m--------- | qttranslations | 0 | ||||
m--------- | qtwayland | 0 |
21 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/macos/nodejs.sh b/coin/provisioning/common/macos/nodejs.sh index b3728999..1313d27e 100755 --- a/coin/provisioning/common/macos/nodejs.sh +++ b/coin/provisioning/common/macos/nodejs.sh @@ -43,8 +43,8 @@ urlCache="http://ci-files01-hki.ci.local/input/nodejs/node-v$version.pkg" urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg" sha1="4720274971c40fe51b2c647060f77c45fb4949a7" -DownloadURL $urlCache $urlOffcial $sha1 "/tmp" -sudo installer -pkg node-v$version.pkg -target / +DownloadURL $urlCache $urlOffcial $sha1 "/tmp/node-v$version.pkg" +sudo installer -pkg "/tmp/node-v$version.pkg" -target / echo "Nodejs = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh index fbd1081d..54b9d774 100644 --- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh @@ -37,5 +37,5 @@ set -ex sudo yum -y install gcc-toolset-9 -echo "source /opt/rh/gcc-toolset-10/enable" >> ~/.bashrc +echo "source /opt/rh/gcc-toolset-9/enable" >> ~/.bashrc diff --git a/qt3d b/qt3d -Subproject c7aa288fd643463cec0d03b9cfb8c854b383942 +Subproject 22509ec535e9c6883faa363c646b0ee1c1aa90e diff --git a/qt5compat b/qt5compat -Subproject 61aa690352b2d5b5a0e781b1938f7ea17e7d8d5 +Subproject be973b7ee7a93dcc13b61f773f25a0c1f9fee0d diff --git a/qtbase b/qtbase -Subproject e066c4d4bf1a0008a1993802c4e5b97f8df974d +Subproject 73621cbf0a5f53990b2c7a966bc6fd71299ec8f diff --git a/qtcoap b/qtcoap -Subproject 618c330f084f9a60d56f20003197b66d7d64ec1 +Subproject b2ad0574b36a75ccea1dc794ec1b75b347ac029 diff --git a/qtdeclarative b/qtdeclarative -Subproject 5b0a4213ce2fcd38e7a818fdc48635e7c19014e +Subproject 77fd3a0969e05f3741307afef8721aba7ee6c8c diff --git a/qtdoc b/qtdoc -Subproject 5dcb4a0caad00eab8df9cdb16880c2ed8b6a705 +Subproject 9fc3cc14f34861a94507d9d8bdbe1f5f64a2155 diff --git a/qtimageformats b/qtimageformats -Subproject a8ceead2aae26974b72a233779ececac36f28bf +Subproject e5e4a89ba59275e1f758029990a4311248095cf diff --git a/qtmqtt b/qtmqtt -Subproject 150e35d48086d3fa488a4de9beb718713e731e0 +Subproject 8c862dd25d7940017dd4a6f124c3f9f7f44e7e0 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 1b24f8f472548d815735f93e6e313d41dc0b100 +Subproject 7f01b77b7c27a567440ee66a478ed0d7d318845 diff --git a/qtopcua b/qtopcua -Subproject 2131f67494957519225ab3487f5a7201e7a9ce2 +Subproject a510d14c2fbc6c2f07dbeb1ffc5e536eec8f5ea diff --git a/qtqa b/qtqa -Subproject 4239183b2367db4f73f23ca0e5a2466d0aca258 +Subproject 7e0965cb004e6e4cea7746b838fbd6334ea61d0 diff --git a/qtquick3d b/qtquick3d -Subproject 6978d2b8b579a77abd5875d28fe61e3fada4eb8 +Subproject 28087235acfbcffb4172acaa06227244bc9fa75 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 06eefa58c987068651fc4bd0063d12217854369 +Subproject 3b4f4a5d4f70f35e256260cc4b5d6cae9c0dad6 diff --git a/qtquicktimeline b/qtquicktimeline -Subproject d40d4d2d51af74f47ab8f21126e21966a8b1f77 +Subproject f1e06e4a16c8ae9ee97b655da32fa0803951416 diff --git a/qtshadertools b/qtshadertools -Subproject af1bdc7aced7cce7406ad0db481261cc4c15a0e +Subproject 227f6a9706eaccc41641873be01f406ba11ab70 diff --git a/qtsvg b/qtsvg -Subproject 3ea889f30aa9bc63b938342412e33c7686053d3 +Subproject f1a74f5e68fc366259087ccd85ddf8087e89d26 diff --git a/qttools b/qttools -Subproject f00d0ad23be576d2ccfa47ef2018344db104803 +Subproject ec8d842b35032d41a2cd32689d5e83c1133f681 diff --git a/qttranslations b/qttranslations -Subproject b4b5adc4d8aaf3529a63d0958e310bc11a6ce88 +Subproject 83503740913a3e095eef6a996b157297fc75a30 diff --git a/qtwayland b/qtwayland -Subproject 65d717a27a4917fe39c538067f7defbe115f2e8 +Subproject 3d4cee05a5642fdd6f1d43ff36cc53c5028a896 |