switch qt build version to qt6

.github/workflows/build_cmake.yml

@@ -10,7 +10,7 @@ on:
       - master
 
 env:
-  QT_VERSION: 5.15.1
+  QT_VERSION: 6.6.1
   CCACHE_VERSION: 3.7.7
   CACHE_PARTITION: dev
   HOST_N_CORES: 2
@@ -74,7 +74,7 @@ jobs:
       env:
         TOOLCHAIN: "win64_msvc2019_64"
         DIR: "msvc2019_64"
-      shell: bash --noprofile --norc -eo pipefail -x {0} 
+      shell: bash --noprofile --norc -eo pipefail -x {0}
       run: |
         py -m pip install -r Tools/qt/qt-downloader-requirements.txt
         QT_INSTALL_DIR="/c/Qt"
@@ -89,7 +89,7 @@ jobs:
       id: qt_mac
       if: runner.os == 'macOS'
       shell: bash --noprofile --norc -eo pipefail -x {0}
-      env: 
+      env:
         TOOLCHAIN: "clang_64"
       run: |
         pip3 install -r Tools/qt/qt-downloader-requirements.txt

.github/workflows/draft_release.yml

@@ -7,7 +7,7 @@ on:
         description: "Coin build number, e.g. 1600955993"
         required: true
       qt_version:
-        description: "Qt version used for building artifacts, e.g. 5.15.1"
+        description: "Qt version used for building artifacts, e.g. 6.6.1"
         required: true
       tag_name:
         description: "Tag name, e.g. qtwebkit-5.212.0-alpha5"

Tools/qt/conanfile.py

@@ -30,7 +30,7 @@ class QtWebKitConan(ConanFile):
     license = "LGPL-2.0-or-later, LGPL-2.1-or-later, BSD-2-Clause"
     url = "https://github.com/qtwebkit/qtwebkit"
     description = "Qt port of WebKit"
-    topics = ("qt", "browser-engine", "webkit", "qt5", "qml", "qtwebkit")
+    topics = ("qt", "browser-engine", "webkit", "qt6", "qml", "qtwebkit")
     settings = "os", "compiler", "arch", "arch_build"
     generators = "cmake", "virtualenv", "txt"
     exports_sources = "../../*"

Tools/qt/generate-dependencies-yaml

@@ -33,7 +33,7 @@ my @qt_dependencies = qw(qtbase qtdeclarative qtlocation qtmultimedia qtsensors
 sub qtModuleRef {
     my ($module, $tag) = @_;
 
-    -d $module or die "No such directory $module - this script must be run in qt5";
+    -d $module or die "No such directory $module - this script must be run in qt6";
     my $output = `git ls-tree $tag $module`;
 
     # Format is "<mode> SP <type> SP <object> TAB <file>"

Tools/qt/qt-downloader

@@ -72,10 +72,10 @@ def discover_kits(args):
       versions_dict = {}
       versions = discover_dirs(BaseUrl + os_type + target)
       for version in versions:
-        if version.startswith('tools_') or version.endswith('_preview/') or version.endswith('_wasm/') or '_src' in version or not version.startswith('qt5_'):
+        if version.startswith('tools_') or version.endswith('_preview/') or version.endswith('_wasm/') or '_src' in version or not version.startswith('qt6_'):
           continue
 
-        ver = decode_version(version[len('qt5_'):-1])
+        ver = decode_version(version[len('qt6_'):-1])
         versions_dict[ver] = None
 
         if not (args.version == 'discover' and args.all or args.version != 'discover' and args.version != 'latest' and args.version == ver):
@@ -97,7 +97,7 @@ def discover_kits(args):
 
 def build_url(args):
   ver = args.version.replace('.', '')
-  return BaseUrl + '{}/{}/qt5_{}/'.format(OsMap[args.os], args.target, ver)
+  return BaseUrl + '{}/{}/qt6_{}/'.format(OsMap[args.os], args.target, ver)
 
 
 def toolchain_build_url(args, tools):
@@ -174,7 +174,7 @@ def download_and_extract(archives_url, archives, output, req_modules):
         suggestion = ' Run sudo apt install p7zip-full on Ubuntu'
       elif os_type == 'macos':
         suggestion = ' Run brew install p7zip on macOS'
-        
+
       raise RuntimeError('Check that 7z command is in your PATH.{}'.format(suggestion))
     except KeyboardInterrupt:
       print('Interrupted')
@@ -218,7 +218,7 @@ def show_discover_context(args, parser):
 
 def show_discovered_parameters(args, params, labels):
   print('Discovering available ', end='')
-  
+
   discoverables = []
   for index, param in enumerate(params):
     if param == 'discover':

Tools/qt/update-wip-qtwebkit-refs

@@ -49,7 +49,7 @@ print "git push -f $remote $commit:refs/heads/wip/qtwebkit/5.212 && git push -f
 `git push -f $remote $commit:refs/heads/wip/qtwebkit/5.212 && git push -f $remote $commit:refs/staging/wip/qtwebkit/5.212`;
 $? == 0 or die "git exited with code $?";
 
-my $qt5TagName = "qtwebkit-5.212-" . time();
-print "git tag -a '$qt5TagName' -m '$qt5TagName' && git push qtwebkit '$qt5TagName'\n";
-`git tag -a '$qt5TagName' -m '$qt5TagName' && git push qtwebkit '$qt5TagName'`;
+my $qt6TagName = "qtwebkit-5.212-" . time();
+print "git tag -a '$qt6TagName' -m '$qt6TagName' && git push qtwebkit '$qt6TagName'\n";
+`git tag -a '$qt6TagName' -m '$qt6TagName' && git push qtwebkit '$qt6TagName'`;
 $? == 0 or die "git exited with code $?";