summaryrefslogtreecommitdiffstats
path: root/src/phonon
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-09-28 14:25:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-09-28 14:25:35 (GMT)
commit05737f5cc5811c80b5bdb99b411f50393ce7b612 (patch)
tree78859f7668cf3ab56a6c51dfd9df3264778dce92 /src/phonon
parentf517fb87487ae34b468f9b3d2bc965fbcaa88452 (diff)
parentabfec3ab053e8eae1f8f60e2ab7e107a1ad7635c (diff)
downloadQt-05737f5cc5811c80b5bdb99b411f50393ce7b612.zip
Qt-05737f5cc5811c80b5bdb99b411f50393ce7b612.tar.gz
Qt-05737f5cc5811c80b5bdb99b411f50393ce7b612.tar.bz2
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
Diffstat (limited to 'src/phonon')
0 files changed, 0 insertions, 0 deletions