diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-02-01 10:33:17 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-01 12:31:16 +0100 |
commit | 256dc059eeea05878112e4cbb55d9a152d21fa1a (patch) | |
tree | ac6b92ec5dd09f874d05f223ef9b274374d2bf1b /src/xml/doc | |
parent | f9725ce9c2d16474ca47ab6ac25f5df748b12ab5 (diff) | |
parent | 6239af6f0f15871e02a516c97c5f1775743d352b (diff) |
Merge "Merge branch 'release' into stable" into refs/staging/stable
Diffstat (limited to 'src/xml/doc')
-rw-r--r-- | src/xml/doc/snippets/code/src_xml_dom_qdom.cpp | 8 | ||||
-rw-r--r-- | src/xml/doc/snippets/rsslisting/listing.cpp (renamed from src/xml/doc/snippets/rsslisting/rsslisting.cpp) | 0 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/xml/doc/snippets/code/src_xml_dom_qdom.cpp b/src/xml/doc/snippets/code/src_xml_dom_qdom.cpp index 367bd22bbe..6b7a9bfbce 100644 --- a/src/xml/doc/snippets/code/src_xml_dom_qdom.cpp +++ b/src/xml/doc/snippets/code/src_xml_dom_qdom.cpp @@ -108,7 +108,7 @@ QDomElement element4 = document.createElement("MyElement"); //! [7] -<link href="http://qt.nokia.com" color="red" /> +<link href="http://qt-project.org" color="red" /> //! [7] @@ -116,10 +116,10 @@ QDomElement element4 = document.createElement("MyElement"); QDomElement e = //... //... QDomAttr a = e.attributeNode("href"); -cout << a.value() << endl; // prints "http://qt.nokia.com" -a.setValue("http://qt.nokia.com/doc"); // change the node's attribute +cout << a.value() << endl; // prints "http://qt-project.org" +a.setValue("http://qt-project.org/doc"); // change the node's attribute QDomAttr a2 = e.attributeNode("href"); -cout << a2.value() << endl; // prints "http://qt.nokia.com/doc" +cout << a2.value() << endl; // prints "http://qt-project.org/doc" //! [8] diff --git a/src/xml/doc/snippets/rsslisting/rsslisting.cpp b/src/xml/doc/snippets/rsslisting/listing.cpp index c62212713c..c62212713c 100644 --- a/src/xml/doc/snippets/rsslisting/rsslisting.cpp +++ b/src/xml/doc/snippets/rsslisting/listing.cpp |