Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix handling of font family from HTML on Qt 6 builds #56358

Merged
merged 1 commit into from Feb 19, 2024

Conversation

nyalldawson
Copy link
Collaborator

At some stage we'll likely need to update QgsTextCharacterFormat to use a list of families to match the Qt 6 changes, but for now just get the first listed font.

@github-actions github-actions bot added this to the 3.36.0 milestone Feb 15, 2024
Copy link

github-actions bot commented Feb 15, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit 22029f6)

At some stage we'll likely need to update QgsTextCharacterFormat to
use a list of families to match the Qt 6 changes, but for now just
get the first listed font.
@nyalldawson nyalldawson merged commit 8139887 into qgis:master Feb 19, 2024
28 of 30 checks passed
@nyalldawson nyalldawson deleted the fix_char_format_family branch February 19, 2024 22:56
@qgis-bot
Copy link
Collaborator

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 22029f6c66d... Fix handling of font family from HTML on Qt 6 builds
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging .ci/test_blocklist_qt6.txt
CONFLICT (content): Merge conflict in .ci/test_blocklist_qt6.txt
Auto-merging tests/src/python/test_qgstextdocument.py
CONFLICT (content): Merge conflict in tests/src/python/test_qgstextdocument.py

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-3_34 release-3_34
# Navigate to the new working tree
cd .worktrees/backport-release-3_34
# Create a new branch
git switch --create backport-56358-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 22029f6c66dbe1790f25f813ba7627e3e28314b0
# Push it to GitHub
git push --set-upstream origin backport-56358-to-release-3_34
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_34

Then, create a pull request where the base branch is release-3_34 and the compare/head branch is backport-56358-to-release-3_34.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Feb 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_34 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants