Merge v6.0.2 into pyside6.0

Tagged Qt 6.0.2 content

Change-Id: I196fc7f7d8b26ab36b31fc6ee68c7d51d0916580

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
 

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

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

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;