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/oasis/p43pass1.xml | |
| 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/oasis/p43pass1.xml')
| -rw-r--r-- | tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/oasis/p43pass1.xml | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/oasis/p43pass1.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/oasis/p43pass1.xml new file mode 100644 index 0000000000..b3991f1b11 --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/oasis/p43pass1.xml @@ -0,0 +1,27 @@ +<!DOCTYPE elem
+[
+<!ELEMENT elem (#PCDATA|elem)*>
+<!ENTITY ent "<elem>CharData</elem>">
+]>
+<elem>
+CharData 
+<!--comment-->
+<![CDATA[
+<elem>
+CharData 
+<!--comment-->
+<?pi?>&ent;"
+CharData
+</elem>
+]]>
+<![CDATA[
+<elem>
+CharData 
+<!--comment-->
+<?pi?>&ent;"
+CharData
+</elem>
+]]>
+<?pi?>&ent;"
+CharData
+</elem>
|