Update Qt (to 6.8.2) and other dependencies #739
+49
−37
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jdpurcell
commented
Feb 3, 2025
| fi | ||
|
|
||
| echo "Running codesign" | ||
| if [[ "$APPLE_NOTARIZE_REQUESTED" == "true" ]]; then | ||
| APP_IDENTIFIER=$(/usr/libexec/PlistBuddy -c "Print CFBundleIdentifier" "qView.app/Contents/Info.plist") | ||
| codesign --sign "$CODESIGN_CERT_NAME" --deep --options runtime --timestamp "qView.app" | ||
| codesign --sign "$CODESIGN_CERT_NAME" --deep --force --options runtime --timestamp "qView.app" |
There was a problem hiding this comment.
Qt changed something about the way they sign the macOS binaries in 6.8 and I found I needed to use --force here otherwise it ends up invalid in some way and rejected if sent to Apple for notarization.
jdpurcell
commented
Feb 3, 2025
| $isCrossCompile = $env:buildArch -eq 'Arm64' | ||
| $winDeployQt = $isCrossCompile ? "$(qmake -query QT_HOST_PREFIX)\bin\windeployqt" : "windeployqt" | ||
| $argQtPaths = $isCrossCompile ? "--qtpaths=$env:QT_ROOT_DIR\bin\qtpaths.bat" : $null | ||
| $argForceOpenSsl = $qtVersion -ge [version]'6.8' ? "--force-openssl" : $null |
There was a problem hiding this comment.
Aside from some cleanup/refactoring in this area, the real change was passing --force-openssl since Qt no longer ships the OpenSSL backend plugin by default as of the 6.8 version of windeployqt.
jdpurcell
commented
Feb 3, 2025
| rm "qView.app/Contents/PlugIns/imageformats/libqmacheif.dylib" | ||
| rm "$IMF_DIR/libqmacheif.dylib" | ||
| fi | ||
| if [[ (-f "$IMF_DIR/kimg_tga.dylib" || -f "$IMF_DIR/kimg_tga.so") && -f "$IMF_DIR/libqtga.dylib" ]]; then |
There was a problem hiding this comment.
This was more of a pre-existing fix since I realized we were also shipping duplicate TGA plugins even prior to the updates.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Goes with jurplel/kimageformats-binaries#10, build will fail until that's merged.
Main benefit of Qt 6.8 is CMYK support. Also brings some styling fixes (of arguable significance w/ the current settings UI) for the windows11 style, and would allow Windows 10 users to have this style (dark mode finally!) if they wanted, assuming they install Segoe Fluent Icons font and set
QT_STYLE_OVERRIDEenvironment variable towindows11:NOTE: Raises minimum macOS version on non-legacy build from 11 to 12.