diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-08 12:16:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-08 12:16:22 (GMT) |
| commit | 2e62a4c339fc90c4adc4238fed1ae1387f8fee67 (patch) | |
| tree | a82d916bc804ba24506f99701ac6202cd30e576a | |
| parent | 4540ed6f9003f7563e1963bdcc4adb6688e1dcb0 (diff) | |
| parent | 74b7d4c2c4036e9f2c0da7f0eaad06cef954b923 (diff) | |
| download | Qt-2e62a4c339fc90c4adc4238fed1ae1387f8fee67.zip Qt-2e62a4c339fc90c4adc4238fed1ae1387f8fee67.tar.gz Qt-2e62a4c339fc90c4adc4238fed1ae1387f8fee67.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
qdoc: Fixed a crash caused by accessing a null pointer.
Doc: Fixed the example of an encoded URL in the class description.
| -rw-r--r-- | src/corelib/io/qurl.cpp | 5 | ||||
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 4226f9e..60a4ce3 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(), diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index ae7385e..9f512d3 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -2098,9 +2098,10 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark generateSince(qcn, marker); enterSection("h2","Detailed Description"); generateBody(qcn, marker); - if (cn) + if (cn) { generateQmlText(cn->doc().body(), cn, marker, qcn->name()); - generateAlsoList(cn, marker); + generateAlsoList(cn, marker); + } leaveSection(); leaveSection(); // </apiDesc> |