Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

1 files changed, 66 insertions, 0 deletions

diff --git a/src/xmlpatterns/schema/doc/Schema_diagram.dot b/src/xmlpatterns/schema/doc/Schema_diagram.dot
new file mode 100644
index 0000000..7d39337
--- /dev/null
+++ b/src/xmlpatterns/schema/doc/Schema_diagram.dot
@@ -0,0 +1,66 @@
+digraph Schema {
+  mindist = 2.0
+  1 -> 5 [label="group"]
+  1 -> 5 [label="complexType"]
+  1 -> 2 [label="import"]
+  1 -> 2 [label="include"]
+  1 -> 2 [label="annotation"]
+  1 -> 3 [label="defaultOpenContent"]
+  1 -> 5 [label="simpleType"]
+  1 -> 5 [label="element"]
+  1 -> 5 [label="notation"]
+  1 -> 2 [label="override"]
+  1 -> 5 [label="attribute"]
+  1 -> 5 [label="attributeGroup"]
+  1 -> 2 [label="redefine"]
+  2 -> 5 [label="group"]
+  2 -> 5 [label="complexType"]
+  2 -> 2 [label="import"]
+  2 -> 2 [label="include"]
+  2 -> 2 [label="annotation"]
+  2 -> 3 [label="defaultOpenContent"]
+  2 -> 5 [label="simpleType"]
+  2 -> 5 [label="element"]
+  2 -> 5 [label="notation"]
+  2 -> 2 [label="override"]
+  2 -> 5 [label="attribute"]
+  2 -> 5 [label="attributeGroup"]
+  2 -> 2 [label="redefine"]
+  3 -> 5 [label="group"]
+  3 -> 5 [label="complexType"]
+  3 -> 4 [label="annotation"]
+  3 -> 5 [label="simpleType"]
+  3 -> 5 [label="element"]
+  3 -> 5 [label="notation"]
+  3 -> 5 [label="attribute"]
+  3 -> 5 [label="attributeGroup"]
+  4 -> 5 [label="group"]
+  4 -> 5 [label="complexType"]
+  4 -> 5 [label="simpleType"]
+  4 -> 5 [label="element"]
+  4 -> 5 [label="notation"]
+  4 -> 5 [label="attribute"]
+  4 -> 5 [label="attributeGroup"]
+  5 -> 5 [label="group"]
+  5 -> 5 [label="complexType"]
+  5 -> 6 [label="annotation"]
+  5 -> 5 [label="simpleType"]
+  5 -> 5 [label="element"]
+  5 -> 5 [label="notation"]
+  5 -> 5 [label="attribute"]
+  5 -> 5 [label="attributeGroup"]
+  6 -> 5 [label="group"]
+  6 -> 5 [label="complexType"]
+  6 -> 6 [label="annotation"]
+  6 -> 5 [label="simpleType"]
+  6 -> 5 [label="element"]
+  6 -> 5 [label="notation"]
+  6 -> 5 [label="attribute"]
+  6 -> 5 [label="attributeGroup"]
+  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]
+  5 [shape=doublecircle, style=filled, color=green]
+  6 [shape=doublecircle, style=filled, color=green]
+}