diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-06 05:46:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-06 05:46:11 (GMT) |
| commit | cf5fd899032391f0b98ff343b0808007c3a5903f (patch) | |
| tree | 3ac4213a0a9911dd4a26bd6ee7656d5eaf84a0bb /src/xml/dom/qdom.cpp | |
| parent | 32290f508b2d250cd7a3a783e8b7d2322e676783 (diff) | |
| parent | 9abc55f373d11d9b329f164f6894812b94af7bce (diff) | |
| download | Qt-cf5fd899032391f0b98ff343b0808007c3a5903f.zip Qt-cf5fd899032391f0b98ff343b0808007c3a5903f.tar.gz Qt-cf5fd899032391f0b98ff343b0808007c3a5903f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixes scrolling horizontally with a mouse wheel over sliders.
Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
A fix for accidently reused variable names in nested iterations.
Iain's changes for 4.6.2
Doc: Fixed typo.
Diffstat (limited to 'src/xml/dom/qdom.cpp')
| -rw-r--r-- | src/xml/dom/qdom.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index cae959b..8d9ae4f 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -2973,7 +2973,7 @@ QDomElement QDomNode::lastChildElement(const QString &tagName) const } /*! - Returns the next sibilng element with tag name \a tagName if \a tagName + Returns the next sibling element with tag name \a tagName if \a tagName is non-empty; otherwise returns any next sibling element. Returns a null element if no such sibling exists. |