-
Notifications
You must be signed in to change notification settings - Fork 486
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
Added Qt multimedia component from PythonQt #992
Conversation
I've reviewed this commit and it looks good to me. However, this cannot be merged because a merge commit was added to this branch just minutes ago. Please rebase on latest master and squash the commits to get rid of the merge commit. |
First do a forced rebase on commontk/CTK master. That may make this spurious merge commit go away. If it remains there then you can squash all the commits in TortoiseGit: right-click on the CTK folder, click "Git show log", select all your commits, right-click, choose "Combine to one commit". You can of course use any other git clients. Start the commit message with |
I'm not sure what you mean by force rebase en commontk/CTK master. Do I do it from my fork ? |
Yes, you rebase all the changes on your fork on the latest master version in the upstream repository. While rebasing you should have the option of squashing all commits. Forcing the rebase may be necessary because your branch may be already based on the latest upstream master version and then rebase would be a no-op. |
4884c34
to
1427933
Compare
Thanks for the help. Seems good to go now. |
Yes, it looks good now. We just need to wait on commontk/PythonQt#80 to be merged. |
1427933
to
df20465
Compare
Thanks for the contribution 🙏 Now that your changes are merged in the CTK fork of PythonQt, could you also update CTK/CMakeExternals/PythonQt.cmake Line 85 in 34a390a
c4a5a155b2942d4b003862c3317105b4a1ea6755 ?
For an example of commit message. See e485a3f |
7394391
to
4d9fd44
Compare
@jcfr Revision tag updated 👍 |
PythonQt includes wrapping for Qt multimedia, but there was no option to include it in CTK, so I added it.
This is related to another PR in PythonQt, which is pending approval.