lmms
lmms copied to clipboard
Handle signature changes for nativeEventFilter for qt6
One more step closer towards #6614. Also fixes build error on MSVC.
note : since i'm continuing off of #7182, all the commits from there seem to occur here too.
note : since i'm continuing off of #7182, all the commits from there seem to occur here too.
Why not just create a new branch from the Qt6 branch? I think that would look much cleaner for two changed files. :wink:
Should be quite simple to cherry-pick and squash the changes in a fresh branch.
Otherwise it looks good to me.
Why not just create a new branch from the Qt6 branch?
I was just being too lazy. Any way to reset this branch and cherry pick other than an interactive rebase?
Why not just create a new branch from the Qt6 branch?
I was just being too lazy. Any way to reset this branch and cherry pick other than an interactive rebase?
I'm not sure if there's a simple way due to the fact that the previous commits got squashed into the qt6
branch. I would just create a new branch from the tip of qt6
, cherry-pick the three commits, squash them interactively and then push.
Doesn't that mean closing this one and open a seperate PR. I'm fine either way tho.
Yes, I think that would be necessary. On the other hand, if you squash-merge then the "weird" history would not be visible anyway. Would be better to start future pull requests from the qt6
branch though.
Would be better to start future pull requests from the qt6 branch though.
Noted
@tresf what's with the mac ci fail, it seems to occur quite frequently. also merge?
@tresf what's with the mac ci fail, it seems to occur quite frequently
- Error: Command failed: hdiutil detach /Volumes/LMMS 1.3.0-alpha.1.648+pr72
- hdiutil: detach failed - No such file or directory
The CI doesn't like the temporary disk image for some reason. Probably just a bug with the CI.
also merge?
I'll defer that to someone more familiar. 🍻
I'll defer that to someone more familiar
@DomClark ?
@Rossmaxx FYI, the CI issues are fixed on master. I'll rebase the qt6 branch so that they exist there as well. The conflicts seem very trivial but if I mess something up with the rebase, I'll try to fix it.
Ok, this went into conflict as well. You'll have to reset your local branch, I hope you don't mind.
I mess something up with the rebase, I'll try to fix it.
I did. Looking into it.
I did. Looking into it.
Fixed. @Rossmaxx want me to fast forward this PR, or do you want to tackle it as part of the unresolved discussion?
Merge now?
@Rossmaxx:
winEventFilter
--> win32EventFilter
and we should be good to merge.