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 crash in QgsStringUtils::truncateMiddleOfString on qt 6 #56356

Merged
merged 2 commits into from Feb 16, 2024

Conversation

nyalldawson
Copy link
Collaborator

No description provided.

@github-actions github-actions bot added this to the 3.36.0 milestone Feb 14, 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 2a45cac)

Co-authored-by: Julien Cabieces <julien.cabieces@oslandia.com>
@nyalldawson nyalldawson merged commit ef1d7a1 into qgis:master Feb 16, 2024
29 checks passed
@nyalldawson nyalldawson deleted the fix_qstring_crash branch February 16, 2024 02:33
@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 6b6f0f2356a... Fix crash in QgsStringUtils::truncateMiddleOfString on qt 6
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 src/core/qgsstringutils.cpp

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-56356-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 6b6f0f2356a427d1f7911e23f5cd13d26f5a0a44,2a45cace9166397a6f4791836514341e011ea1c5
# Push it to GitHub
git push --set-upstream origin backport-56356-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-56356-to-release-3_34.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Feb 16, 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