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/P51/ibm51v01.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/ibm/valid/P51/ibm51v01.xml')
-rw-r--r-- | tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P51/ibm51v01.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P51/ibm51v01.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P51/ibm51v01.xml new file mode 100644 index 0000000000..ea18f9060c --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P51/ibm51v01.xml @@ -0,0 +1,22 @@ +<?xml version="1.0"?>
+<!DOCTYPE root [
+ <!ELEMENT root ANY>
+ <!--* test all possible Mixed content type decl *-->
+ <!ELEMENT a (#PCDATA)* >
+ <!ELEMENT b (#PCDATA) >
+ <!ELEMENT c ( #PCDATA)*>
+ <!ELEMENT d (#PCDATA|c)*>
+ <!ELEMENT e (#PCDATA|c| b|a)* >
+ <!ELEMENT f (#PCDATA| c)* >
+ <!ELEMENT g ( #PCDATA) >
+ <!ELEMENT h (#PCDATA )>
+ <!ELEMENT i ( #PCDATA ) >
+]>
+<root>
+ <a> Element type a </a>
+ <b> Element type b </b>
+ <c> Element type c </c>
+ <d> Element type d <c></c> </d>
+ <e> Element type e <a></a> <b></b> <c></c> </e>
+</root>
+<!--* a valid test: tests P51 *-->
\ No newline at end of file |