-
-
Notifications
You must be signed in to change notification settings - Fork 1k
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
Handle signature changes for nativeEventFilter for qt6 #7254
Conversation
This reverts commit 42a2f19.
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 |
Noted |
@tresf what's with the mac ci fail, it seems to occur quite frequently. also merge? |
- 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.
I'll defer that to someone more familiar. 🍻 |
|
@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 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? |
|
One more step closer towards #6614. Also fixes build error on MSVC.