A Git timeout occured. Only metadata is being displayed
Reviewing merge request #432: Qdbus method overloading support
I added some additional checks to finding a method in qdbus command line tool. Previously, it would take the first method matching the name, so in case of
void foo(int a)
void foo(int a, QStringList b)
and calling
qdbus org.dbustest / foo 15 "(" string list ")"
It would result in "invalid number of parameters" since it tried to match against the first method.
Commits that would be merged:
How to apply this merge request to your repository
One way to merge in these changes is to pull them into a local
branch for review, verifying the changes and then merge to back
to master.
# Check out a new branch for integration
git checkout -b merge-requests/432
# Fetch the merge request into this branch
git pull \
git://gitorious.org/qt/qt.git \
refs/merge-requests/432
# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/432
# To apply the changes to your branch:
git checkout master
git merge merge-requests/432
git push origin master
Add a new comment:
Login or create an account to post a comment