4.6.4 ports #30881
4.6.4 ports #30881
Conversation
Resolves: musescore#30273 Save & restore the custom colors of the `QColorDialog`. Qt versions before 6.9 saved these per user in a `QSettings` instance under the organization name "QtProject". This functionality must be replaced by client code (us). Legacy values are read and used as default values.
|
As far as I can tell the vtest failures are expected and happened to the origunal PRs too |
|
@Jojo-Schmitz thank you! While you're at it, may I bother you to add #30771 as well? |
That seems to be in already!?! Jojo@DodekaCore MINGW64 ~/Documents/GitHub/MuseScore (4.6.4-ports)
$ git cherry-pick a848ac4
Auto-merging src/engraving/rendering/score/measurenumberlayout.cpp
On branch 4.6.4-ports
Your branch is up to date with 'origin/4.6.4-ports'.
You are currently cherry-picking commit a848ac488c.
(all conflicts fixed: run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
nothing to commit, working tree clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git cherry-pick --skip'Seems you did it already in ac965a2, actually I did it in this very PR here? Mystery solved: I misstyped the PR number in the PR message, corrected now I don't quite understand why that PR fixes it only for measure numbers above, i.e. why the same issue won't happen for measure numbers below? |
Jojo-Schmitz
force-pushed
the
4.6.4-ports
branch
2 times, most recently
from
3f9229e to
f505cd3
Compare
Jojo-Schmitz
force-pushed
the
4.6.4-ports
branch
from
f505cd3 to
e7e1104
Compare
reg.: 'return': conversion from 'size_t' to 'int', possible loss of data (C4267) Co-Authored-By: Casper Jeukendrup <[email protected]>
…imported as corrupt
Should use effectiveStaffIdx as opposed to checking its "original" staff because staves may be hidden in between.
to determine interruption points for rest alignement
incl. fixing a merge conflict
Jojo-Schmitz
force-pushed
the
4.6.4-ports
branch
from
e7e1104 to
54c9b0a
Compare
Good point, hadn't thought of it (because it's a lot less common), I'll do it in a next PR (or feel free to do one yourself). Meanwhile I'll merge this, thanks! |
|
See #30911 |
5 participants
#30786 is listed as "Needs porting" but not yet merged to master, so not included here, actually that got ported and merged into 4.6.4 already, via #30815