diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-02-17 20:31:38 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-17 20:31:38 +0100 |
commit | e88011357e5dd3b0ae4e6bc715ef29e5f4f3ffab (patch) | |
tree | c5b05d45e49194d70ff4defae41e5d5d5cf75e80 /src/xml/doc | |
parent | 2df8884bc68343ad96962e7496b98d6e585c0347 (diff) | |
parent | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/xml/doc')
-rw-r--r-- | src/xml/doc/qtxml.qdocconf | 12 | ||||
-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 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/xml/doc/qtxml.qdocconf b/src/xml/doc/qtxml.qdocconf index 028af1bf76..4e8cf34b0c 100644 --- a/src/xml/doc/qtxml.qdocconf +++ b/src/xml/doc/qtxml.qdocconf @@ -2,22 +2,22 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtXml description = Qt XML Reference Documentation -url = http://qt-project.org/doc/qtxml -version = 5.1.0 +url = http://qt-project.org/doc/qt-$QT_VER/qtxml +version = $QT_VERSION examplesinstallpath = xml qhp.projects = QtXml qhp.QtXml.file = qtxml.qhp -qhp.QtXml.namespace = org.qt-project.qtxml.510 +qhp.QtXml.namespace = org.qt-project.qtxml.$QT_VERSION_TAG qhp.QtXml.virtualFolder = qtxml qhp.QtXml.indexTitle = Qt XML qhp.QtXml.indexRoot = -qhp.QtXml.filterAttributes = qtxml 5.1.0 qtrefdoc -qhp.QtXml.customFilters.Qt.name = QtXml 5.1.0 -qhp.QtXml.customFilters.Qt.filterAttributes = qtxml 5.1.0 +qhp.QtXml.filterAttributes = qtxml $QT_VERSION qtrefdoc +qhp.QtXml.customFilters.Qt.name = QtXml $QT_VERSION +qhp.QtXml.customFilters.Qt.filterAttributes = qtxml $QT_VERSION qhp.QtXml.subprojects = classes qhp.QtXml.subprojects.classes.title = C++ Classes 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 |