Merge pull request #722 from jdpurcell/pr-update673

Qt 6.7.3 and other updates
jurplel · Oct 14, 2024 · 14f4d45 · 14f4d45
2 parents 26aa460 + e7bb170
commit 14f4d45
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,20 +25,20 @@ jobs:
             qtVersion: '5.9'
             osSuffix: '_qt5.9'
             skipPlugins: 'true'
-          - runner: 'macos-12'
-            qtVersion: '6.5.3'
+          - runner: 'macos-14'
+            qtVersion: '6.7.3'
             qtModules: 'qtimageformats'
             buildArch: 'Universal'
-          - runner: 'macos-12'
+          - runner: 'macos-13'
             qtVersion: '5.15.2'
             osSuffix: '_legacy'
           - runner: 'windows-2022'
-            qtVersion: '6.5.3'
+            qtVersion: '6.7.3'
             qtArch: 'win64_msvc2019_64'
             osSuffix: '_64'
             qtModules: 'qtimageformats'
           - runner: 'windows-2022'
-            qtVersion: '6.5.3'
+            qtVersion: '6.7.3'
             qtArch: 'win64_msvc2019_arm64'
             osSuffix: '_arm64'
             qtModules: 'qtimageformats'

diff --git a/dist/scripts/build.ps1 b/dist/scripts/build.ps1
@@ -7,6 +7,11 @@ param
 
 if ($IsWindows) {
     dist/scripts/vcvars.ps1
+} elseif ($IsMacOS) {
+    if ($qtVersion -lt [version]'6.5.3') {
+        # Workaround for QTBUG-117484
+        sudo xcode-select --switch /Applications/Xcode_14.3.1.app
+    }
 }
 
 if ($IsMacOS -and $env:buildArch -eq 'Universal') {

diff --git a/dist/scripts/download-plugins.ps1 b/dist/scripts/download-plugins.ps1
@@ -4,14 +4,14 @@
 
 $pluginNames = "qtapng", "kimageformats"
 
-$qtVersion = ((qmake --version -split '\n')[1] -split ' ')[3]
+$qtVersion = [version]((qmake --version -split '\n')[1] -split ' ')[3]
 Write-Host "Detected Qt Version $qtVersion"
 
 # Qt version availability and runner names are assumed.
 if ($IsWindows) {
     $imageName = "windows-2022"
 } elseif ($IsMacOS) {
-    $imageName = "macos-12"
+    $imageName = $qtVersion -lt [version]'6.5.3' ? "macos-13" : "macos-14"
 } else {
     $imageName = "ubuntu-20.04"
 }
@@ -71,14 +71,14 @@ if ($pluginNames -contains 'kimageformats') {
         if (Test-Path -Path kimageformats/kimageformats/output/avif.dll -PathType Leaf) {
             cp kimageformats/kimageformats/output/avif.dll "$out_frm/"
             cp kimageformats/kimageformats/output/aom.dll "$out_frm/"
+            cp kimageformats/kimageformats/output/jpeg62.dll "$out_frm/"
+            cp kimageformats/kimageformats/output/libyuv.dll "$out_frm/"
         }
         # copy heif stuff
         if (Test-Path -Path kimageformats/kimageformats/output/heif.dll -PathType Leaf) {
             cp kimageformats/kimageformats/output/heif.dll "$out_frm/"
             cp kimageformats/kimageformats/output/libde265.dll "$out_frm/"
-            if ($env:buildArch -ne 'Arm64') {
-                cp kimageformats/kimageformats/output/libx265.dll "$out_frm/"
-            }
+            cp kimageformats/kimageformats/output/libx265.dll "$out_frm/"
             cp kimageformats/kimageformats/output/aom.dll "$out_frm/"
         }
         # copy raw stuff

diff --git a/dist/scripts/windeployqt.ps1 b/dist/scripts/windeployqt.ps1
@@ -3,32 +3,32 @@ param
     $NightlyVersion = ""
 )
 
-$qtVersion = ((qmake --version -split '\n')[1] -split ' ')[3]
+$qtVersion = [version]((qmake --version -split '\n')[1] -split ' ')[3]
 Write-Host "Detected Qt Version $qtVersion"
 
 if ($env:buildArch -ne 'Arm64') {
     # Download and extract openssl
-    if ($qtVersion -like '5.*') {
+    if ($qtVersion.Major -le 5) {
         $openSslDownloadUrl = "https://download.firedaemon.com/FireDaemon-OpenSSL/openssl-1.1.1w.zip"
-        $openSslFolderVersion = "1.1"
+        $openSslSubfolder = "openssl-1.1\"
         $openSslFilenameVersion = "1_1"
     } else {
-        $openSslDownloadUrl = "https://download.firedaemon.com/FireDaemon-OpenSSL/openssl-3.2.1.zip"
-        $openSslFolderVersion = "3"
+        $openSslDownloadUrl = "https://download.firedaemon.com/FireDaemon-OpenSSL/openssl-3.3.2.zip"
+        $openSslSubfolder = ""
         $openSslFilenameVersion = "3"
     }
     Write-Host "Downloading $openSslDownloadUrl"
     $ProgressPreference = 'SilentlyContinue'
     Invoke-WebRequest -Uri $openSslDownloadUrl -OutFile openssl.zip
-    7z x -y .\openssl.zip
+    7z x -y openssl.zip -o"openssl"
 
     # Install approprate binaries for architecture
     if ($env:buildArch -eq 'X86') {
-        copy openssl-$openSslFolderVersion\x86\bin\libssl-$openSslFilenameVersion.dll bin\
-        copy openssl-$openSslFolderVersion\x86\bin\libcrypto-$openSslFilenameVersion.dll bin\
+        copy openssl\$openSslSubfolder\x86\bin\libssl-$openSslFilenameVersion.dll bin\
+        copy openssl\$openSslSubfolder\x86\bin\libcrypto-$openSslFilenameVersion.dll bin\
     } else {
-        copy openssl-$openSslFolderVersion\x64\bin\libssl-$openSslFilenameVersion-x64.dll bin\
-        copy openssl-$openSslFolderVersion\x64\bin\libcrypto-$openSslFilenameVersion-x64.dll bin\
+        copy openssl\$openSslSubfolder\x64\bin\libssl-$openSslFilenameVersion-x64.dll bin\
+        copy openssl\$openSslSubfolder\x64\bin\libcrypto-$openSslFilenameVersion-x64.dll bin\
     }
 }