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.

Merge-request: 2276
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>

1 files changed, 9 insertions, 5 deletions

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index fd51bcf..6ac6468 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -3864,14 +3864,18 @@ QByteArray QUrlPrivate::toEncoded(QUrl::FormattingOptions options) const
         url += "//";
 
         if ((options & QUrl::RemoveUserInfo) != QUrl::RemoveUserInfo) {
+            bool hasUserOrPass = false;
             if (!userName.isEmpty()) {
                 url += encodedUserName;
-                if (!(options & QUrl::RemovePassword) && !password.isEmpty()) {
-                    url += ':';
-                    url += encodedPassword;
-                }
-                url += '@';
+                hasUserOrPass = true;
             }
+            if (!(options & QUrl::RemovePassword) && !password.isEmpty()) {
+                url += ':';
+                url += encodedPassword;
+                hasUserOrPass = true;
+            }
+            if (hasUserOrPass)
+                url += '@';
         }
 
         if (host.startsWith(QLatin1Char('['))) {