summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-09-29 00:25:35 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-09-29 00:25:35 +1000
commit05737f5cc5811c80b5bdb99b411f50393ce7b612 (patch)
tree78859f7668cf3ab56a6c51dfd9df3264778dce92
parentf517fb87487ae34b468f9b3d2bc965fbcaa88452 (diff)
parentabfec3ab053e8eae1f8f60e2ab7e107a1ad7635c (diff)
downloadqt4-tools-05737f5cc5811c80b5bdb99b411f50393ce7b612.tar.gz
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QAuthenticator::setUser() parse user name in form user@domain
-rw-r--r--src/network/kernel/qauthenticator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index 818aab73a5..4f7f4ed80d 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -223,7 +223,7 @@ void QAuthenticator::setUser(const QString &user)
} else if((separatorPosn = user.indexOf(QLatin1String("@"))) != -1) {
//domain name is present
d->realm.clear();
- d->userDomain = user.left(separatorPosn);
+ d->userDomain = user.mid(separatorPosn + 1);
d->extractedUser = user.left(separatorPosn);
d->user = user;
} else {