diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index bce68549..a189ea87 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -41,19 +41,20 @@ set -ex # This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.6.1" -qtBranch="515x" +version="6.7-20210119-1632" +qtBranch="60x" installFolder="/opt" squishFolder="$installFolder/squish" preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable" -licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license" +licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license" licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a" if uname -a |grep -q Darwin; then - compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" + version="6.6.1" + compressedFolder="prebuild-squish-$version-515x-macx86_64.tar.gz" sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="3a50052caafa3ca583b7edf754227999d7185ffa" + sha1="8780665c3560456cd86980802cb24513233444fe" fi mountFolder="/tmp/squish" @@ -96,7 +97,8 @@ sudo mv "$installFolder/rta_squish_$version" "$squishFolder" if uname -a |grep -q "Ubuntu"; then if [ ! -e "/usr/lib/tcl8.6" ]; then sudo mkdir /usr/lib/tcl8.6 - sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ + #this needs to be copied only to squish_for_qt6 + sudo cp "$squishFolder/squish_for_qt6/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ fi fi @@ -108,18 +110,34 @@ sudo chown qt:$usersGroup "$HOME/.squish-3-license" echo "Set commands for environment variables in .bashrc" if uname -a |grep -q "Ubuntu"; then - echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile - echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile + echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.profile + echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.profile else echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc fi -echo "Verifying Squish" -if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then - echo "Squish for Qt installation tested successfully" +echo "Verifying Squish, available installations:" +ls -la $squishFolder +if uname -a |grep -q Darwin; then + if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt installation tested successfully" + else + echo "Squish for Qt test failed! Package wasn't installed correctly." + exit 1 + fi else - echo "Squish for Qt test failed! Package wasn't installed correctly." - exit 1 + if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt5 installation tested successfully" + else + echo "Squish for Qt5 test failed! Package wasn't installed correctly." + exit 1 + fi + if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt6 installation tested successfully" + else + echo "Squish for Qt6 test failed! Package wasn't installed correctly." + exit 1 + fi fi diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index c615f9eb..dbd6da16 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -36,12 +36,12 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "6.6.1" -$qtBranch = "515x" +$version = "6.7-20210112-1612" +$qtBranch = "60x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" -$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" +$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\515x" # Squish license $licensePackage = ".squish-3-license" @@ -60,7 +60,7 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren if ($OSVersion -eq "Windows 10 Enterprise") { $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" + $sha1 = "628bb65cf515d08df388b0dc4d5b403e4c6657b2" } else { $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh index aed78aee..1195f95a 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -104,3 +104,5 @@ sudo rm -f "$targetFile" sudo sed -i'.orig' -e 's:^#/net:/net:' -e 's:hidefromfinder,nosuid:hidefromfinder,nosuid,locallocks,nocallback:' /etc/auto_master sudo automount -cv +# Disable multicast advertisements +sudo defaults write /Library/Preferences/com.apple.mDNSResponder.plist NoMulticastAdvertisements -bool true diff --git a/init-repository b/init-repository index 2e0ddcde..81c9bb74 100755 --- a/init-repository +++ b/init-repository @@ -640,12 +640,13 @@ sub run chomp(my $url = `git config remote.origin.url`); die("Have no origin remote.\n") if (!$url); $url =~ s,\.git$,,; - $url =~ s/qt5$//; + $url =~ s/((?:tqtc-)?qt5)$//; + my $qtrepo = $1 or 'qt5'; $self->{'base-url'} = $url; - $self->git_clone_all_submodules('qt5', $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}}); + $self->git_clone_all_submodules($qtrepo, $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}}); - $self->git_add_remotes('qt5'); + $self->git_add_remotes($qtrepo); $self->git_install_hooks; diff --git a/qt3d b/qt3d index 606dd3d4..e046a40b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 606dd3d4474f7bd82cc6092184889fbcfad7a8ec +Subproject commit e046a40b74ba9d25f1c73165b74eb805e330ff8f diff --git a/qt5compat b/qt5compat index 816d4e24..739d144c 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 816d4e2437a52164e085c2f721a77fa3b98407ab +Subproject commit 739d144cba52bdba738c14de41c45659bddf8ab1 diff --git a/qtbase b/qtbase index fada6a1c..723077eb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fada6a1cbd978ee81d76e937775e52a064a98362 +Subproject commit 723077eb3529810aa3b99d8c06f9b81a586763c9 diff --git a/qtdeclarative b/qtdeclarative index d347cbfc..da46b97e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d347cbfc8cb493d0ef5e20f9fd1c0e4060fa9470 +Subproject commit da46b97ed5a56ce3db8e903053dd10bb9b7d2904 diff --git a/qtdoc b/qtdoc index 526be4ee..5290cda9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 526be4eeed8ba3dc5e12ecd8e1812752e6ce6e33 +Subproject commit 5290cda943d013b5e630b9bbf8c6d8e2f79f0726 diff --git a/qtimageformats b/qtimageformats index 96c3dc41..f83d417b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 96c3dc4182c7e5150461158407f68ccd614d209d +Subproject commit f83d417b7b8595b384f9fba96b96107f474df33a diff --git a/qtqa b/qtqa index 8374a072..b0eee13d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8374a072b04733e7d395112355f96949360c56bf +Subproject commit b0eee13d4390ae7bdde161b9659a2922b0a83c59 diff --git a/qtquick3d b/qtquick3d index a3dfb3ce..60a51c97 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit a3dfb3ce0f683f9df51af952e4bb063dc8742f71 +Subproject commit 60a51c975cedb9ddd82c4109a47f6fd8938e02fa diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 66de1cfb..7be5c507 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 66de1cfba665e2c4b540814c7ba4d02fa56a0a91 +Subproject commit 7be5c50775781593483b5956df15f3e7b1e225d4 diff --git a/qtquicktimeline b/qtquicktimeline index 8225d416..b3ff9f76 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 8225d416270ff40105492f53ea548c9c5220bab5 +Subproject commit b3ff9f762e2884d637fdb3a24ecadfbcadde2e68 diff --git a/qtrepotools b/qtrepotools index 7efc56e5..a829867f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7efc56e59dfd7cc300f92e3c3e7744202fd7b021 +Subproject commit a829867f0873227451099d77597706b5efb5ed10 diff --git a/qtshadertools b/qtshadertools index 954da6eb..03ee874d 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 954da6eb42a49e09c9c0f53f7bd9d05f9d94eb4f +Subproject commit 03ee874da27b88b46f06abd124d8a5345f028210 diff --git a/qtsvg b/qtsvg index 12564495..af7b4e8d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 12564495210727b78ade1563d37a66d9621f7c3f +Subproject commit af7b4e8d7d0836b778bcafba6d34ea36c43a010d diff --git a/qttools b/qttools index 0c1de95d..e9c0625d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0c1de95dbc8f374da2b0f2566217b33e11ca8e3a +Subproject commit e9c0625d07ed4d476cd8fdba4cfb4d2509f46317 diff --git a/qttranslations b/qttranslations index 1d412188..50facb10 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 1d41218824de36c2aa17bea51cfa8c7df974ef7c +Subproject commit 50facb10cb7b62545a0c5be4fec0ae91a0db636e diff --git a/qtwayland b/qtwayland index 76a89e52..49276bc3 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 76a89e522fa59ddcf638fdcc71952e09aef41122 +Subproject commit 49276bc3bfb5578e9dfa3b1fe9be7f63d5996513