Reviewing merge request #2276: QUrl::toEncoded() fix for the case of "password, but no username".

QUrl::toEncoded() fix for the case of "password, but no username".
QUrl::setPassword() without QUrl::setUserName() is actually useful,
e.g. for kde's ldap:// slave. QUrl::toString() already handled this correctly,
but QUrl::toEncoded() would forget the password in such a case.

Autotest added.

Requested by: David Faure
Status: Merged
Source repository: dfaures-clone:qurl_setpass
Target repository: qt:4.6
Created at: December 21st, 2009 20:17

Commits that would be merged:

Version 1

Version 1

bf819a0
7ab1bb8

QUrl::toEncoded() fix for the case of "password, but no username".

Showing

Showing bf819a0-7ab1bb8

Comments
Include comments entered inline

→ State changed from New to Merged

Merged in 8c306f8ee137baebc312a126c4e0d27bb9150f69

Olivier Goffart | 2009-12-28 16:56:57 UTC

Add a new comment:

Login or create an account to post a comment

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/2276

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/qt/qt.git \
  refs/merge-requests/2276

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit 4.6..merge-requests/2276

# To apply the changes to your branch:
git checkout 4.6
git merge merge-requests/2276
git push origin 4.6

Reviewing merge request #2276: QUrl::toEncoded() fix for the case of "password, but no username".

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline