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

Don't use custom palette in crash handler dialog, this results in unreadable text on dark themes #47110

Merged
merged 1 commit into from
Feb 1, 2022

Conversation

nyalldawson
Copy link
Collaborator

Fixes #47065

Copy link
Contributor

@nirvn nirvn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I always wondered why it was not following system colors, yet never bothered to check.

@github-actions github-actions bot added this to the 3.24.0 milestone Feb 1, 2022
@nyalldawson nyalldawson merged commit 30b81ce into qgis:master Feb 1, 2022
@nyalldawson nyalldawson deleted the crash_dlg_theme branch February 1, 2022 06:10
@qgis-bot
Copy link
Collaborator

qgis-bot commented Feb 1, 2022

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0188cbee9c... Don't use custom palette in crash handler dialog, this results in
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 src/crashhandler/qgscrashdialog.ui
CONFLICT (content): Merge conflict in src/crashhandler/qgscrashdialog.ui

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-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-47110-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0188cbee9cf6e3aa3fdae8955818e3ff257c1ea9
# Push it to GitHub
git push --set-upstream origin backport-47110-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-47110-to-queued_ltr_backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unreadable text in dark theme
3 participants