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/eduni/errata-2e/out | |
| 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/eduni/errata-2e/out')
6 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/CVS/Entries new file mode 100644 index 0000000000..84bbe99bd6 --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/CVS/Entries @@ -0,0 +1,4 @@ +/E18.xml/1.1.1.1/Tue Aug 26 11:52:07 2003// +/E19.xml/1.1.1.1/Tue Aug 26 11:52:07 2003// +/E24.xml/1.1.1.1/Tue Aug 26 11:52:07 2003// +D diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/CVS/Repository new file mode 100644 index 0000000000..94bd81f49f --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/CVS/Repository @@ -0,0 +1 @@ +2001/XML-Test-Suite/xmlconf/eduni/errata-2e/out diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/CVS/Root new file mode 100644 index 0000000000..3c7177e4bb --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/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/eduni/errata-2e/out/E18.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/E18.xml new file mode 100644 index 0000000000..727de27226 --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/E18.xml @@ -0,0 +1 @@ +<foo>entity from main dir, right!</foo>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/E19.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/E19.xml new file mode 100644 index 0000000000..c1db16e5fa --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/E19.xml @@ -0,0 +1 @@ +<foo>hello ! goodbye</foo>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/E24.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/E24.xml new file mode 100644 index 0000000000..abed8b7372 --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/eduni/errata-2e/out/E24.xml @@ -0,0 +1 @@ +<foo>You can use ]]> or ]]></foo>
\ No newline at end of file |