Merge branch 'master' of git:qt/qt-qml

Conflicts:
	src/declarative/graphicsitems/qdeclarativeparticles.cpp

1 files changed, 135 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml
new file mode 100644
index 0000000..b2d0209
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml
@@ -0,0 +1,135 @@
+import Qt 4.6
+
+QtObject {
+    property bool xmlTest: false
+    property bool dataOK: false
+
+    Script {
+        function checkCData(text, whitespacetext)
+        {
+            // This is essentially a copy of text.qml/checkText()
+
+            if (text == null)
+                return;
+
+            if (text.nodeName != "#cdata-section")
+                return;
+
+            if (text.nodeValue != "Hello world!")
+                return;
+
+            if (text.nodeType != 4)
+                return;
+
+            if (text.parentNode.nodeName != "item")
+                return;
+
+            if (text.childNodes.length != 0)
+                return;
+
+            if (text.firstChild != null)
+                return;
+
+            if (text.lastChild != null)
+                return;
+
+            if (text.previousSibling != null)
+                return;
+
+            if (text.nextSibling != null)
+                return;
+
+            if (text.attributes != null)
+                return;
+
+            if (text.wholeText != "Hello world!")
+                return;
+
+            if (text.data != "Hello world!")
+                return;
+
+            if (text.length != 12)
+                return;
+
+            if (text.isElementContentWhitespace != false)
+                return;
+
+            if (whitespacetext.nodeName != "#cdata-section")
+                return;
+
+            if (whitespacetext.nodeValue != "   ")
+                return;
+
+            if (whitespacetext.nodeType != 4)
+                return;
+
+            if (whitespacetext.parentNode.nodeName != "item")
+                return;
+
+            if (whitespacetext.childNodes.length != 0)
+                return;
+
+            if (whitespacetext.firstChild != null)
+                return;
+
+            if (whitespacetext.lastChild != null)
+                return;
+
+            if (whitespacetext.previousSibling != null)
+                return;
+
+            if (whitespacetext.nextSibling != null)
+                return;
+
+            if (whitespacetext.attributes != null)
+                return;
+
+            if (whitespacetext.wholeText != "   ")
+                return;
+
+            if (whitespacetext.data != "   ")
+                return;
+
+            if (whitespacetext.length != 3)
+                return;
+
+            if (whitespacetext.isElementContentWhitespace != true)
+                return;
+
+
+            xmlTest = true;
+        }
+
+        function checkXML(document)
+        {
+            checkCData(document.documentElement.childNodes[0].childNodes[0],
+                       document.documentElement.childNodes[1].childNodes[0]);
+
+        }
+    }
+
+    Component.onCompleted: {
+        var x = new XMLHttpRequest;
+
+        x.open("GET", "cdata.xml");
+
+        // Test to the end
+        x.onreadystatechange = function() {
+            if (x.readyState == XMLHttpRequest.DONE) {
+
+                dataOK = true;
+
+                if (x.responseXML != null)
+                    checkXML(x.responseXML);
+
+            }
+        }
+
+        x.send()
+    }
+}
+
+
+
+
+