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

Handle signature changes for nativeEventFilter for qt6 #7254

Merged
merged 78 commits into from
May 19, 2024

Conversation

Rossmaxx
Copy link
Contributor

@Rossmaxx Rossmaxx commented May 13, 2024

One more step closer towards #6614. Also fixes build error on MSVC.

@Rossmaxx
Copy link
Contributor Author

Doesn't that mean closing this one and open a seperate PR. I'm fine either way tho.

@michaelgregorius
Copy link
Contributor

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.

@Rossmaxx
Copy link
Contributor Author

Would be better to start future pull requests from the qt6 branch though.

Noted

@Rossmaxx
Copy link
Contributor Author

@tresf what's with the mac ci fail, it seems to occur quite frequently. also merge?

@tresf
Copy link
Member

tresf commented May 15, 2024

@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. 🍻

@Rossmaxx
Copy link
Contributor Author

I'll defer that to someone more familiar

@DomClark ?

include/MainApplication.h Outdated Show resolved Hide resolved
src/gui/MainApplication.cpp Outdated Show resolved Hide resolved
@tresf
Copy link
Member

tresf commented May 17, 2024

@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.

@tresf
Copy link
Member

tresf commented May 17, 2024

I mess something up with the rebase, I'll try to fix it.

I did. Looking into it.

@tresf
Copy link
Member

tresf commented May 17, 2024

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?

@Rossmaxx
Copy link
Contributor Author

Merge now?

@tresf
Copy link
Member

tresf commented May 18, 2024

@Rossmaxx:

winEventFilter --> win32EventFilter and we should be good to merge.

@tresf tresf merged commit d43f4e2 into LMMS:qt6 May 19, 2024
8 checks passed
@Rossmaxx Rossmaxx deleted the experiment-qt6 branch June 21, 2024 11:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants