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/CVS | |
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/CVS')
3 files changed, 72 insertions, 0 deletions
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/CVS/Entries new file mode 100644 index 0000000000..67e5dbe407 --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/CVS/Entries @@ -0,0 +1,70 @@ +D/P01//// +D/P02//// +D/P03//// +D/P09//// +D/P10//// +D/P11//// +D/P12//// +D/P13//// +D/P14//// +D/P15//// +D/P16//// +D/P17//// +D/P18//// +D/P19//// +D/P20//// +D/P21//// +D/P22//// +D/P23//// +D/P24//// +D/P25//// +D/P26//// +D/P27//// +D/P28//// +D/P29//// +D/P30//// +D/P31//// +D/P32//// +D/P33//// +D/P34//// +D/P35//// +D/P36//// +D/P37//// +D/P38//// +D/P39//// +D/P40//// +D/P41//// +D/P42//// +D/P43//// +D/P44//// +D/P45//// +D/P47//// +D/P49//// +D/P50//// +D/P51//// +D/P52//// +D/P54//// +D/P55//// +D/P56//// +D/P57//// +D/P58//// +D/P59//// +D/P60//// +D/P61//// +D/P62//// +D/P63//// +D/P64//// +D/P65//// +D/P66//// +D/P67//// +D/P68//// +D/P69//// +D/P70//// +D/P78//// +D/P79//// +D/P82//// +D/P85//// +D/P86//// +D/P87//// +D/P88//// +D/P89//// diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/CVS/Repository new file mode 100644 index 0000000000..48acd66c01 --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/CVS/Repository @@ -0,0 +1 @@ +2001/XML-Test-Suite/xmlconf/ibm/valid diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/CVS/Root new file mode 100644 index 0000000000..3c7177e4bb --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@dev.w3.org:/sources/public |