Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	configure
	configure.exe
	src/gui/kernel/qaction.h

1 files changed, 62 insertions, 0 deletions

diff --git a/src/xmlpatterns/schema/doc/SimpleRestriction_diagram.dot b/src/xmlpatterns/schema/doc/SimpleRestriction_diagram.dot
new file mode 100644
index 0000000..09cb041
--- /dev/null
+++ b/src/xmlpatterns/schema/doc/SimpleRestriction_diagram.dot
@@ -0,0 +1,62 @@
+digraph SimpleRestriction {
+  mindist = 2.0
+  1 -> 4 [label="fractionDigits"]
+  1 -> 4 [label="minLength"]
+  1 -> 4 [label="whiteSpace"]
+  1 -> 2 [label="annotation"]
+  1 -> 3 [label="simpleType"]
+  1 -> 4 [label="length"]
+  1 -> 4 [label="maxExclusive"]
+  1 -> 4 [label="enumeration"]
+  1 -> 4 [label="assertion"]
+  1 -> 4 [label="maxInclusive"]
+  1 -> 4 [label="maxLength"]
+  1 -> 4 [label="pattern"]
+  1 -> 4 [label="totalDigits"]
+  1 -> 4 [label="minExclusive"]
+  1 -> 4 [label="minInclusive"]
+  2 -> 4 [label="fractionDigits"]
+  2 -> 4 [label="minLength"]
+  2 -> 4 [label="whiteSpace"]
+  2 -> 3 [label="simpleType"]
+  2 -> 4 [label="length"]
+  2 -> 4 [label="maxExclusive"]
+  2 -> 4 [label="enumeration"]
+  2 -> 4 [label="assertion"]
+  2 -> 4 [label="maxInclusive"]
+  2 -> 4 [label="maxLength"]
+  2 -> 4 [label="pattern"]
+  2 -> 4 [label="totalDigits"]
+  2 -> 4 [label="minExclusive"]
+  2 -> 4 [label="minInclusive"]
+  3 -> 4 [label="fractionDigits"]
+  3 -> 4 [label="minLength"]
+  3 -> 4 [label="whiteSpace"]
+  3 -> 4 [label="length"]
+  3 -> 4 [label="maxExclusive"]
+  3 -> 4 [label="enumeration"]
+  3 -> 4 [label="assertion"]
+  3 -> 4 [label="maxInclusive"]
+  3 -> 4 [label="maxLength"]
+  3 -> 4 [label="pattern"]
+  3 -> 4 [label="totalDigits"]
+  3 -> 4 [label="minExclusive"]
+  3 -> 4 [label="minInclusive"]
+  4 -> 4 [label="fractionDigits"]
+  4 -> 4 [label="minLength"]
+  4 -> 4 [label="whiteSpace"]
+  4 -> 4 [label="length"]
+  4 -> 4 [label="maxExclusive"]
+  4 -> 4 [label="enumeration"]
+  4 -> 4 [label="assertion"]
+  4 -> 4 [label="maxInclusive"]
+  4 -> 4 [label="maxLength"]
+  4 -> 4 [label="pattern"]
+  4 -> 4 [label="totalDigits"]
+  4 -> 4 [label="minExclusive"]
+  4 -> 4 [label="minInclusive"]
+  1 [shape=doublecircle, style=filled, color=blue]
+  2 [shape=doublecircle, style=filled, color=green]
+  3 [shape=doublecircle, style=filled, color=green]
+  4 [shape=doublecircle, style=filled, color=green]
+}