diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-13 07:24:47 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-13 08:27:51 (GMT) |
| commit | 13cbcc0ddca0fdd5be9ede09052d31785c1e4d55 (patch) | |
| tree | b647be5699145ccae1545096aba5c495d96f8eb5 /tests/auto/qxmlstream | |
| parent | 081078137a6fbc85d6be1437f6afc1d60e4f75f9 (diff) | |
| parent | de088b5a7f7b57e568399334667b14bfc9e7b893 (diff) | |
| download | Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.zip Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.gz Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.bz2 | |
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 'tests/auto/qxmlstream')
| -rw-r--r-- | tests/auto/qxmlstream/data/namespaceCDATA.ref | 16 | ||||
| -rw-r--r-- | tests/auto/qxmlstream/data/namespaceCDATA.xml | 4 | ||||
| -rw-r--r-- | tests/auto/qxmlstream/qc14n.h | 2 | ||||
| -rw-r--r-- | tests/auto/qxmlstream/tst_qxmlstream.cpp | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/qxmlstream/data/namespaceCDATA.ref b/tests/auto/qxmlstream/data/namespaceCDATA.ref index accd7cf..9734d22 100644 --- a/tests/auto/qxmlstream/data/namespaceCDATA.ref +++ b/tests/auto/qxmlstream/data/namespaceCDATA.ref @@ -1,21 +1,21 @@ StartDocument( ) DTD( text="<!DOCTYPE footype [ - <!ATTLIST foo xmlns CDATA #FIXED "http://www.trolltech.com"> - <!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://www.trolltech.com"> + <!ATTLIST foo xmlns CDATA #FIXED "http://qt.nokia.com"> + <!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://qt.nokia.com"> ]>" dtdName="footype" ) StartElement( name="body" qualifiedName="body" ) Characters( whitespace text=" " ) -StartElement( name="foo" namespaceUri="http://www.trolltech.com" qualifiedName="foo" - NamespaceDeclaration( namespaceUri="http://www.trolltech.com" ) +StartElement( name="foo" namespaceUri="http://qt.nokia.com" qualifiedName="foo" + NamespaceDeclaration( namespaceUri="http://qt.nokia.com" ) ) -EndElement( name="foo" namespaceUri="http://www.trolltech.com" qualifiedName="foo" ) +EndElement( name="foo" namespaceUri="http://qt.nokia.com" qualifiedName="foo" ) Characters( whitespace text=" " ) -StartElement( name="bar" namespaceUri="http://www.trolltech.com" qualifiedName="pre:bar" prefix="pre" - NamespaceDeclaration( prefix="pre" namespaceUri="http://www.trolltech.com" ) +StartElement( name="bar" namespaceUri="http://qt.nokia.com" qualifiedName="pre:bar" prefix="pre" + NamespaceDeclaration( prefix="pre" namespaceUri="http://qt.nokia.com" ) ) -EndElement( name="bar" namespaceUri="http://www.trolltech.com" qualifiedName="pre:bar" ) +EndElement( name="bar" namespaceUri="http://qt.nokia.com" qualifiedName="pre:bar" ) Characters( whitespace text=" " ) EndElement( name="body" qualifiedName="body" ) diff --git a/tests/auto/qxmlstream/data/namespaceCDATA.xml b/tests/auto/qxmlstream/data/namespaceCDATA.xml index c738534..6475dbc 100644 --- a/tests/auto/qxmlstream/data/namespaceCDATA.xml +++ b/tests/auto/qxmlstream/data/namespaceCDATA.xml @@ -1,6 +1,6 @@ <!DOCTYPE footype [ - <!ATTLIST foo xmlns CDATA #FIXED "http://www.trolltech.com"> - <!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://www.trolltech.com"> + <!ATTLIST foo xmlns CDATA #FIXED "http://qt.nokia.com"> + <!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://qt.nokia.com"> ]> <body> <foo/> diff --git a/tests/auto/qxmlstream/qc14n.h b/tests/auto/qxmlstream/qc14n.h index cf5d3ab..3b76a88 100644 --- a/tests/auto/qxmlstream/qc14n.h +++ b/tests/auto/qxmlstream/qc14n.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$ ** ****************************************************************************/ diff --git a/tests/auto/qxmlstream/tst_qxmlstream.cpp b/tests/auto/qxmlstream/tst_qxmlstream.cpp index 1533913..375528c 100644 --- a/tests/auto/qxmlstream/tst_qxmlstream.cpp +++ b/tests/auto/qxmlstream/tst_qxmlstream.cpp @@ -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$ ** ****************************************************************************/ |