diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69 | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69')
12 files changed, 45 insertions, 0 deletions
diff --git a/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/CVS/Entries b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/CVS/Entries new file mode 100644 index 0000000000..3e26ec4cc0 --- /dev/null +++ b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/CVS/Entries @@ -0,0 +1,5 @@ +/ibm69v01.dtd/1.1.1.1/Wed Oct 17 09:52:58 2001// +/ibm69v01.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// +/ibm69v02.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// +/ibm69v02.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// +D/out//// diff --git a/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/CVS/Repository b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/CVS/Repository new file mode 100644 index 0000000000..42be2f9772 --- /dev/null +++ b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/CVS/Repository @@ -0,0 +1 @@ +2001/XML-Test-Suite/xmlconf/ibm/valid/P69 diff --git a/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/CVS/Root b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/CVS/Root new file mode 100644 index 0000000000..3c7177e4bb --- /dev/null +++ b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/ibm69v01.dtd b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/ibm69v01.dtd new file mode 100644 index 0000000000..374f61f567 --- /dev/null +++ b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/ibm69v01.dtd @@ -0,0 +1,4 @@ +<!ENTITY ge1 "abcdef">
+<!ELEMENT a EMPTY>
+<!ATTLIST a attr1 CDATA "&ge1;">
+%pe1;
diff --git a/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/ibm69v01.xml b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/ibm69v01.xml new file mode 100644 index 0000000000..9d3523f891 --- /dev/null +++ b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/ibm69v01.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE root SYSTEM "ibm69v01.dtd" [
+ <!ELEMENT root (#PCDATA|a)* >
+ <!ENTITY % pe1 "<!-- comment in PE -->">
+ %pe1;
+]>
+<root>
+ pcdata content
+ <a attr1="xyz"/>
+</root>
+<!--* a valid test for P69 VC:Entity Declared *-->
diff --git a/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/ibm69v02.ent b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/ibm69v02.ent new file mode 100644 index 0000000000..416c1cc81c --- /dev/null +++ b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/ibm69v02.ent @@ -0,0 +1,6 @@ +<!ENTITY ge1 "abcdef">
+<!ELEMENT a EMPTY>
+<!ATTLIST a attr1 CDATA "&ge1;">
+<!ENTITY % epe1 "<!-- comment in PE -->">
+%epe1;
+
diff --git a/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/ibm69v02.xml b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/ibm69v02.xml new file mode 100644 index 0000000000..98b945933b --- /dev/null +++ b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/ibm69v02.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" standalone='no'?>
+<!DOCTYPE root [
+ <!ELEMENT root (#PCDATA)* >
+ <!ENTITY % pe1 SYSTEM "ibm69v02.ent">
+ %pe1;
+]>
+<root>
+ pcdata content
+</root>
+<!--* a valid test for P69 VC:Entity Declared *-->
diff --git a/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/CVS/Entries b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/CVS/Entries new file mode 100644 index 0000000000..7591e389f9 --- /dev/null +++ b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/CVS/Entries @@ -0,0 +1,3 @@ +/ibm69v01.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// +/ibm69v02.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// +D diff --git a/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/CVS/Repository b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/CVS/Repository new file mode 100644 index 0000000000..e3de03e3c8 --- /dev/null +++ b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/CVS/Repository @@ -0,0 +1 @@ +2001/XML-Test-Suite/xmlconf/ibm/valid/P69/out diff --git a/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/CVS/Root b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/CVS/Root new file mode 100644 index 0000000000..3c7177e4bb --- /dev/null +++ b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/CVS/Root @@ -0,0 +1 @@ +:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/ibm69v01.xml b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/ibm69v01.xml new file mode 100644 index 0000000000..2375979678 --- /dev/null +++ b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/ibm69v01.xml @@ -0,0 +1 @@ +<root> pcdata content <a attr1="xyz"></a> </root>
\ No newline at end of file diff --git a/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/ibm69v02.xml b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/ibm69v02.xml new file mode 100644 index 0000000000..c05dd56b0c --- /dev/null +++ b/tests/auto/corelib/xml/qxmlstream/XML-Test-Suite/xmlconf/ibm/valid/P69/out/ibm69v02.xml @@ -0,0 +1 @@ +<root> pcdata content </root>
\ No newline at end of file |