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

Added Qt multimedia component from PythonQt #992

Merged
merged 1 commit into from
Sep 24, 2021

Conversation

atracsys-sbt
Copy link
Contributor

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.

@lassoan
Copy link
Member

lassoan commented Sep 1, 2021

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.

@atracsys-sbt
Copy link
Contributor Author

I'm sorry, I'm not sure how to do a squash of my commit and the merge in this situation:
image

@lassoan
Copy link
Member

lassoan commented Sep 1, 2021

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 ENH: to make the commit message valid.

@atracsys-sbt
Copy link
Contributor Author

I'm not sure what you mean by force rebase en commontk/CTK master. Do I do it from my fork ?

@lassoan
Copy link
Member

lassoan commented Sep 1, 2021

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.

@atracsys-sbt
Copy link
Contributor Author

Thanks for the help. Seems good to go now.

@lassoan
Copy link
Member

lassoan commented Sep 1, 2021

Yes, it looks good now. We just need to wait on commontk/PythonQt#80 to be merged.

@jcfr
Copy link
Member

jcfr commented Sep 24, 2021

Thanks for the contribution 🙏

Now that your changes are merged in the CTK fork of PythonQt, could you also update

set(revision_tag c306140442feb6e76d4bae672c48cd7f11d9b0cd) # patched-9
to use c4a5a155b2942d4b003862c3317105b4a1ea6755 ?

For an example of commit message. See e485a3f

@atracsys-sbt
Copy link
Contributor Author

@jcfr Revision tag updated 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants