diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-13 09:24:47 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-13 10:27:51 +0200 |
| commit | 13cbcc0ddca0fdd5be9ede09052d31785c1e4d55 (patch) | |
| tree | b647be5699145ccae1545096aba5c495d96f8eb5 /src/xmlpatterns/iterators/qindexofiterator_p.h | |
| parent | 081078137a6fbc85d6be1437f6afc1d60e4f75f9 (diff) | |
| parent | de088b5a7f7b57e568399334667b14bfc9e7b893 (diff) | |
| download | qt4-tools-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.gz | |
Merge commit 'qt/master'
Conflicts:
examples/opengl/samplebuffers/glwidget.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/kernel/qobject.cpp
src/corelib/tools/qsharedpointer.cpp
src/gui/gui.pro
tests/auto/qhttp/tst_qhttp.cpp
tests/auto/qkeyevent/tst_qkeyevent.cpp
Diffstat (limited to 'src/xmlpatterns/iterators/qindexofiterator_p.h')
| -rw-r--r-- | src/xmlpatterns/iterators/qindexofiterator_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/iterators/qindexofiterator_p.h b/src/xmlpatterns/iterators/qindexofiterator_p.h index fc04207834..ba2a97e708 100644 --- a/src/xmlpatterns/iterators/qindexofiterator_p.h +++ b/src/xmlpatterns/iterators/qindexofiterator_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -70,7 +70,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath-functions/#func-index-of">XQuery 1.0 * and XPath 2.0 Functions and Operators, 15.1.3 fn:index-of</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_iterators */ class IndexOfIterator : public Item::Iterator |