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

[layouts] Fix crash when opening layout with dynamic image in html label #31880

Merged
merged 1 commit into from
Sep 19, 2019

Conversation

nyalldawson
Copy link
Collaborator

Fixes #28996

@nyalldawson nyalldawson added backport release-3_4 Bug Either a bug report, or a bug fix. Let's hope for the latter! labels Sep 19, 2019
@nyalldawson nyalldawson merged commit 5db6165 into qgis:master Sep 19, 2019
@nyalldawson nyalldawson deleted the fix_28996_html_crash branch September 19, 2019 20:37
@backporting
Copy link
Contributor

backporting bot commented Sep 19, 2019

The backport to release-3_4 failed:

Commits ["f057354ec899b28a7ee27d4b8990b992d7d0b6d5"] could not be cherry-picked on top of release-3_4

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport release-3_4
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick f057354ec899b28a7ee27d4b8990b992d7d0b6d5
# Create a new branch with these backported commits.
git checkout -b backport-31880-to-release-3_4
# Push it to GitHub.
git push --set-upstream origin backport-31880-to-release-3_4
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Either a bug report, or a bug fix. Let's hope for the latter!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

QGIS 3.4.4 crash when using dynamic image in html textfield in print layout
1 participant