Fix deadlock when rendering annotation layers - #66712
Merged
Merged
Conversation
It's not safe to use a static QRegularExpression, these need to be thread_local instead
Contributor
🍎 MacOS Qt6 buildsDownload MacOS Qt6 builds of this PR for testing. 🪟 Windows Qt6 buildsDownload Windows Qt6 builds of this PR for testing. |
troopa81
approved these changes
Jul 7, 2026
Collaborator
|
The backport to stderrstdoutTo 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_44 release-3_44
# Navigate to the new working tree
cd .worktrees/backport-release-3_44
# Create a new branch
git switch --create backport-66712-to-release-3_44
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 18c3ce9454c8a1568ad7d9655da625daf15068fe f21a443ae28522b1c77524461e4dc29f348dc5f6
# Push it to GitHub
git push --set-upstream origin backport-66712-to-release-3_44
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_44Then, create a pull request where the |
1 task
This file contains hidden or 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
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.
Description
Also potentially a cause of a lot of other deadlocks!
It's not safe to use a static QRegularExpression, these need to be thread_local instead. Otherwise we can hit a deadlock in Qt internals when accessing the same QRegularExpression across multiple threads.
AI tool usage