diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 16:28:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 16:28:30 (GMT) |
| commit | c22daf60d6b2360271f1ed50510749b2ae401c7b (patch) | |
| tree | 77870095a801f72e67aee6c7b3d22360638e6c47 /src | |
| parent | bb3c309cf99e043b4de43feaa8c2a801f7853d22 (diff) | |
| parent | f0c4a037f9ebd184dc25571fa591f89dba943105 (diff) | |
| download | Qt-c22daf60d6b2360271f1ed50510749b2ae401c7b.zip Qt-c22daf60d6b2360271f1ed50510749b2ae401c7b.tar.gz Qt-c22daf60d6b2360271f1ed50510749b2ae401c7b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fix assert error on Windows with a negative char.
Doc: Fixed the example of an encoded URL in the class description.
Added an additional check to workaround an issue on Windows.
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 2f0fd46..3f49cc6 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -63,8 +63,9 @@ unencoded representation is suitable for showing to users, but the encoded representation is typically what you would send to a web server. For example, the unencoded URL - "http://b\uuml\c{}hler.example.com" would be sent to the server as - "http://xn--bhler-kva.example.com/List%20of%20applicants.xml". + "http://b\uuml\c{}hler.example.com/List of applicants.xml" would be sent to the server as + "http://xn--bhler-kva.example.com/List%20of%20applicants.xml", + and this can be verified by calling the toEncoded() function. A URL can also be constructed piece by piece by calling setScheme(), setUserName(), setPassword(), setHost(), setPort(), |