diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-11 00:21:38 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-11 00:21:38 (GMT) |
| commit | c62cd5347adda26a68b3a2a67e04a38c0e8626fe (patch) | |
| tree | 9caf5ef30fb88e17b7153580067d9c8933308ee7 /src/corelib/io/qurl.cpp | |
| parent | dd7230279bf22fe34f04aa7d216b6d2fb60db720 (diff) | |
| parent | 1c76ce32af211250935db7af8fa6f6e3e8afd01c (diff) | |
| download | Qt-c62cd5347adda26a68b3a2a67e04a38c0e8626fe.zip Qt-c62cd5347adda26a68b3a2a67e04a38c0e8626fe.tar.gz Qt-c62cd5347adda26a68b3a2a67e04a38c0e8626fe.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
src/declarative/qml/qdeclarativepropertycache.cpp
src/declarative/qml/qdeclarativepropertycache_p.h
Diffstat (limited to 'src/corelib/io/qurl.cpp')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 626bd3f..a60f206 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -3479,8 +3479,12 @@ QString QUrlPrivate::authority(QUrl::FormattingOptions options) const void QUrlPrivate::setAuthority(const QString &auth) { - if (auth.isEmpty()) + if (auth.isEmpty()) { + setUserInfo(QString()); + host.clear(); + port = -1; return; + } // find the port section of the authority by searching from the // end towards the beginning for numbers until a ':' is reached. |