diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2011-01-20 10:38:03 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2011-01-20 10:38:03 (GMT) |
| commit | ef998bca70a799806c5754edfa49ea625881bc3e (patch) | |
| tree | 2f1ec89d331283cfe53c0cdf5e287683960953e0 /src/corelib/io/qurl.cpp | |
| parent | 43f8762367fa6ffc228ae6e97192766475b02ac0 (diff) | |
| parent | 78a927cd7b93ae3fadd272cab9ee594a1369cea4 (diff) | |
| download | Qt-ef998bca70a799806c5754edfa49ea625881bc3e.zip Qt-ef998bca70a799806c5754edfa49ea625881bc3e.tar.gz Qt-ef998bca70a799806c5754edfa49ea625881bc3e.tar.bz2 | |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'src/corelib/io/qurl.cpp')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 6ec5562..efd3f45 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -4309,6 +4309,7 @@ void QUrl::setUrl(const QString &url) */ void QUrl::setUrl(const QString &url, ParsingMode parsingMode) { + detach(); // escape all reserved characters and delimiters // reserved = gen-delims / sub-delims if (parsingMode != TolerantMode) { |