diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-06 12:38:51 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-02-10 15:55:52 +0100 |
| commit | 32b506d1db1f8cee748a27b548ba8208f2928058 (patch) | |
| tree | 2d5b23baafe22ccc3518719f8f5d19bb846b2b61 /tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43 | |
| parent | 2cb1db64370989fffeec313c196fe573c479e6aa (diff) | |
| parent | c0948d508e7179e2e23c893ba6152c40400de060 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.11
Conflicts:
src/corelib/tools/qvarlengtharray.qdoc
src/corelib/tools/qvector.qdoc
Resolved documentation changes in favor of 017569f702b6dd0,
which keeps the move overloads along with its const-ref sibling.
Change-Id: I0835b0b3211a418e5e50defc4cf315f0964fab79
Diffstat (limited to 'tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43')
8 files changed, 33 insertions, 0 deletions
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/CVS/Entries new file mode 100644 index 0000000000..657d939e7a --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/CVS/Entries @@ -0,0 +1,2 @@ +/ibm43v01.xml/1.1.1.1/Wed Oct 17 09:52:57 2001// +D/out//// diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/CVS/Repository new file mode 100644 index 0000000000..64c985842e --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/CVS/Repository @@ -0,0 +1 @@ +2001/XML-Test-Suite/xmlconf/ibm/valid/P43 diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/CVS/Root new file mode 100644 index 0000000000..3c7177e4bb --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/ibm43v01.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/ibm43v01.xml new file mode 100644 index 0000000000..78a6f0aaf2 --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/ibm43v01.xml @@ -0,0 +1,24 @@ +<?xml version="1.0"?>
+<!DOCTYPE root [
+ <!ELEMENT root (a,b)>
+ <!ELEMENT a EMPTY>
+ <!ELEMENT b (#PCDATA|c)* >
+ <!ELEMENT c ANY>
+ <!ENTITY inContent "<b>General entity reference in element content</b>">
+]>
+<!--* content: element|CharData|Reference|CDSect|PI|CDSect|PI|Comment *-->
+<root><a/><b>
+<!-- there is an empty element in the above line -->
+ <c></c>
+ CharData: content of b element
+ %paaa; : PE reference should not be recognized in element content
+ <c>
+<?PIcontent anyProcessingInstruction?>
+<!-- Comment content -->
+ &inContent;
+ Charater reference: A
+ CDSect in content: <![CDATA[ <html>markups<head>HEAD</head><body>nothing</body></html> ]]>
+ </c>
+</b>
+</root>
+<!--* test P43 *-->
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/out/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/out/CVS/Entries new file mode 100644 index 0000000000..dc162205da --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/out/CVS/Entries @@ -0,0 +1,2 @@ +/ibm43v01.xml/1.1.1.1/Wed Oct 17 09:52:57 2001// +D diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/out/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/out/CVS/Repository new file mode 100644 index 0000000000..1ec9702753 --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/out/CVS/Repository @@ -0,0 +1 @@ +2001/XML-Test-Suite/xmlconf/ibm/valid/P43/out diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/out/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/out/CVS/Root new file mode 100644 index 0000000000..3c7177e4bb --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/out/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/out/ibm43v01.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/out/ibm43v01.xml new file mode 100644 index 0000000000..4925b60469 --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P43/out/ibm43v01.xml @@ -0,0 +1 @@ +<root><a></a><b> <c></c> CharData: content of b element %paaa; : PE reference should not be recognized in element content <c> <?PIcontent anyProcessingInstruction?> <b>General entity reference in element content</b> Charater reference: A CDSect in content: <html>markups<head>HEAD</head><body>nothing</body></html> </c> </b> </root>
\ No newline at end of file |