Merge branch 'newdocs'

Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25

116 files changed, 251 insertions, 2213 deletions

diff --git a/doc/config/qtquick-dita.qdocconf b/doc/config/qtquick-dita.qdocconf
deleted file mode 100644
index ee471c1df1..0000000000
--- a/doc/config/qtquick-dita.qdocconf
+++ /dev/null
@@ -1,36 +0,0 @@
-# Name of the project.
-project = Qt Quick
-
-# Directories in which to search for files to document and images.
-# By default set to the root directory of the project for sources
-# and headers and qdoc will therefore generate output for each file.
-# Images should be placed in <rootdir>/dic/images and examples in
-# <rootdir>/examples.
-# Paths are relative to the  location of this file.
-exampledirs += ../src/examples \
-               ../.. \
-               ../../examples
-
-headerdirs += ../src \
-              ../../src
-
-imagedirs += ../src/images \
-
-sourcedirs += ../src \
-              ../../src
-
-excludedirs += ../src/qtquick1 \
-               ../../src/qtquick1
-
-
-
-
-#Do not change the variables after this line unless you know what you are doing.
-
-outputdir = ../ditaxml
-outputformats = DITAXML
-
-examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml"
-examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng"
-headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx"
-sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
diff --git a/doc/config/qtquick.qdocconf b/doc/config/qtquick.qdocconf
deleted file mode 100644
index 74240cd42c..0000000000
--- a/doc/config/qtquick.qdocconf
+++ /dev/null
@@ -1,79 +0,0 @@
-# Name of the project.
-project = Qt Quick
-description = Qt Quick Documentation
-
-# Directories in which to search for files to document and images.
-# By default set to the root directory of the project for sources
-# and headers and qdoc will therefore generate output for each file.
-# Images should be placed in <rootdir>/dic/images and examples in
-# <rootdir>/examples.
-# Paths are relative to the  location of this file.
-
-exampledirs += ../src/examples \
-               ../.. \
-               ../../examples
-
-headerdirs += ../src \
-              ../../src
-
-imagedirs += ../src/images \
-
-sourcedirs += ../src \
-              ../../src \
-              ../../examples
-
-#indexes = $QT5DOC/doc/html/qt.index
-
-# The following parameters are for creating a qhp file, the qhelpgenerator
-# program can convert the qhp file into a qch file which can be opened in
-# Qt Assistant and/or Qt Creator.
-
-# Defines the name of the project. You cannot use operators (+, =, -) in
-# the name. Properties for this project are set using a qhp.<projectname>.property
-# format.
-qhp.projects = qtquick
-
-# Sets the name of the output qhp file.
-qhp.qtquick.file = qtquick.qhp
-
-# Namespace for the output file. This namespace is used to distinguish between
-# different documentation files in Creator/Assistant. Qt Quick 2 release.
-qhp.qtquick.namespace = qtquick.200
-
-# Title for the package, will be the main title for the package in
-# Assistant/Creator.
-qhp.qtquick.indexTitle = Qt Quick Documentation
-
-# Extra files to add to the output which are not linked to from anywhere
-# using a qdoc \l command.
-qhp.qtquick.extraFiles = style/qtquick.css \
-                                     index.html
-
-# Only update the name of the project for the next variables.
-qhp.qtquick.virtualFolder  = qdoc
-qhp.qtquick.subprojects = classes
-qhp.qtquick.subprojects.classes.title = Classes
-qhp.qtquick.subprojects.classes.selectors = class fake:headerfile
-qhp.qtquick.subprojects.classes.sortPages = true
-
-
-
-# Do NOT change the variables after this line unless you know what you are doing.
-
-outputdir = ../html
-outputformats = HTML
-
-examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml"
-examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng"
-headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx"
-sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
-
-HTML.nobreadcrumbs = "true"
-
-HTML.templatedir = .
-HTML.stylesheets = style/qtquick.css
-
-HTML.headerstyles = "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/qtquick.css\" />\n"
-HTML.endheader = "</head>\n<body>\n"
-
-HTML.footer = "<div class=\"footer\">Copyright (C) 2012 Digia Plc and/or its subsidiaries.</div>\n"
diff --git a/doc/config/style/qtquick.css b/doc/config/style/qtquick.css
deleted file mode 100755
index fe68f466d5..0000000000
--- a/doc/config/style/qtquick.css
+++ /dev/null
@@ -1,763 +0,0 @@
-@media screen
-{
-
-/* basic elements */
-    html
-    {
-        color: #000000;
-        background: #FFFFFF;
-    }
-    table
-    {
-        border-collapse: collapse;
-        border-spacing: 0;
-    }
-    fieldset, img
-    {
-        border: 0;
-        max-width:100%;
-    }
-    address, caption, cite, code, dfn, em, strong, th, var, optgroup
-    {
-        font-style: inherit;
-        font-weight: inherit;
-    }
-    del, ins
-    {
-        text-decoration: none;
-    }
-    ol li
-    {
-        list-style: decimal;
-    }
-    ul li
-    {
-        list-style: none;
-    }
-    caption, th
-    {
-        text-align: left;
-    }
-    h1, h2, h3, h4, h5, h6
-    {
-        font-size: 100%;
-    }
-    q:before, q:after
-    {
-        content: '';
-    }
-    abbr, acronym
-    {
-        border: 0;
-        font-variant: normal;
-    }
-    sup, sub
-    {
-        vertical-align: baseline;
-    }
-    tt, .qmlreadonly span, .qmldefault span
-    {
-        word-spacing:0.5em;
-    }
-    legend
-    {
-        color: #000000;
-    }
-    strong
-    {
-        font-weight: bold;
-    }
-    em
-    {
-        font-style: italic;
-    }
-
-    body
-    {
-        margin: 0px;
-        font-family: sans-serif;
-        line-height: normal
-    }
-    a
-    {
-        color: #00732F;
-        text-decoration: none;
-    }
-    hr
-    {
-        background-color: #E6E6E6;
-        border: 1px solid #E6E6E6;
-        height: 1px;
-        width: 100%;
-        text-align: left;
-        margin: 1.5em 0 1.5em 0;
-    }
-
-    pre
-    {
-        border: 1px solid #DDDDDD;
-        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
-        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
-        border-radius: 0.7em 0.7em 0.7em 0.7em;
-        margin: 0 1.5em 1em 1em;
-        padding: 1em 1em 1em 1em;
-        overflow-x: auto;
-    }
-    table, pre
-    {
-        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
-        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
-        border-radius: 0.7em 0.7em 0.7em 0.7em;
-        background-color: #F6F6F6;
-        border: 1px solid #E6E6E6;
-        border-collapse: separate;
-        margin-bottom: 2.5em;
-    }
-    pre {
-        font-size: 90%;
-        display: block;
-        overflow:hidden;
-    }
-    thead
-    {
-        margin-top: 0.5em;
-        font-weight: bold
-    }
-    th
-    {
-        padding: 0.5em 1.5em 0.5em 1em;
-        background-color: #E1E1E1;
-        border-left: 1px solid #E6E6E6;
-    }
-    td
-    {
-        padding: 0.25em 1.5em 0.25em 1em;
-    }
-
-    td.rightAlign
-    {
-        padding: 0.25em 0.5em 0.25em 1em;
-    }
-    table tr.odd
-    {
-        border-left: 1px solid #E6E6E6;
-        background-color: #F6F6F6;
-        color: black;
-    }
-    table tr.even
-    {
-        border-left: 1px solid #E6E6E6;
-        background-color: #ffffff;
-        color: #202020;
-    }
-
-    div.float-left
-    {
-        float: left; margin-right: 2em
-    }
-    div.float-right
-    {
-        float: right; margin-left: 2em
-    }
-
-    span.comment
-    {
-        color: #008B00;
-    }
-    span.string, span.char
-    {
-        color: #000084;
-    }
-    span.number
-    {
-        color: #a46200;
-    }
-    span.operator
-    {
-        color: #202020;
-    }
-    span.keyword
-    {
-        color: #840000;
-    }
-    span.name
-    {
-        color: black
-    }
-    span.type
-    {
-        font-weight: bold
-    }
-    span.type a:visited
-    {
-        color: #0F5300;
-    }
-    span.preprocessor
-    {
-        color: #404040
-    }
-/* end basic elements */
-
-/* font style elements */
-    .heading
-    {
-        font-weight: bold;
-        font-size: 125%;
-    }
-    .subtitle
-    {
-        font-size: 110%
-    }
-    .small-subtitle
-    {
-        font-size: 100%
-    }
-    .red
-    {
-        color:red;
-    }
-/* end font style elements */
-
-/* global settings*/
-    .header, .footer
-    {
-        display: block;
-        clear: both;
-        overflow: hidden;
-    }
-/* end global settings*/
-
-/* header elements */
-    .header .qtref
-    {
-        color: #00732F;
-        font-weight: bold;
-        font-size: 130%;
-    }
-
-    .header .content
-    {
-        margin-left: 5px;
-        margin-top: 5px;
-        margin-bottom: 0.5em;
-    }
-
-    .header .breadcrumb
-    {
-        font-size: 90%;
-        padding: 0.5em 0 0.5em 1em;
-        margin: 0;
-        background-color: #fafafa;
-        height: 1.35em;
-        border-bottom: 1px solid #d1d1d1;
-    }
-
-    .header .breadcrumb ul
-    {
-        margin: 0;
-        padding: 0;
-    }
-
-    .header .content
-    {
-        word-wrap: break-word;
-    }
-
-    .header .breadcrumb ul li
-    {
-        float: left;
-        background: url(../images/breadcrumb.png) no-repeat 0 3px;
-        padding-left: 1.5em;
-        margin-left: 1.5em;
-    }
-
-    .header .breadcrumb ul li.last
-    {
-        font-weight: normal;
-    }
-
-    .header .breadcrumb ul li a
-    {
-        color: #00732F;
-    }
-
-    .header .breadcrumb ul li.first
-    {
-        background-image: none;
-        padding-left: 0;
-        margin-left: 0;
-    }
-
-    .header .content ol li {
-        background: none;
-        margin-bottom: 1.0em;
-        margin-left: 1.2em;
-        padding-left: 0
-    }
-
-    .header .content li
-    {
-        background: url(../images/bullet_sq.png) no-repeat 0 5px;
-        margin-bottom: 1em;
-        padding-left: 1.2em;
-    }
-
-/* end header elements */
-
-/* content elements */
-    .content h1
-    {
-        font-weight: bold;
-        font-size: 130%
-    }
-
-    .content h2
-    {
-        font-weight: bold;
-        font-size: 120%;
-        width: 100%;
-    }
-    .content h3
-    {
-        font-weight: bold;
-        font-size: 110%;
-        width: 100%;
-    }
-    .content table p
-    {
-        margin: 0
-    }
-    .content ul
-    {
-        padding-left: 2.5em;
-    }
-    .content li
-    {
-        padding-top: 0.25em;
-        padding-bottom: 0.25em;
-    }
-    .content ul img {
-        vertical-align: middle;
-    }
-
-    .content a:visited
-    {
-        color: #4c0033;
-        text-decoration: none;
-    }
-
-    .content a:visited:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-
-    a:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-    descr p a
-    {
-        text-decoration: underline;
-    }
-
-    .descr p a:visited
-    {
-        text-decoration: underline;
-    }
-
-    .alphaChar{
-        width:95%;
-        background-color:#F6F6F6;
-        border:1px solid #E6E6E6;
-        -moz-border-radius: 7px 7px 7px 7px;
-        border-radius: 7px 7px 7px 7px;
-        -webkit-border-radius: 7px 7px 7px 7px;
-        font-size:12pt;
-        padding-left:10px;
-        margin-top:10px;
-        margin-bottom:10px;
-    }
-    .flowList{
-        /*vertical-align:top;*/
-        /*margin:20px auto;*/
-
-        column-count:3;
-        -webkit-column-count:3;
-        -moz-column-count:3;
-/*
-        column-width:100%;
-        -webkit-column-width:200px;
-        -col-column-width:200px;
-*/
-        column-gap:41px;
-        -webkit-column-gap:41px;
-        -moz-column-gap:41px;
-
-        column-rule: 1px dashed #ccc;
-        -webkit-column-rule: 1px dashed #ccc;
-        -moz-column-rule: 1px dashed #ccc;
-    }
-
-    .flowList dl{
-    }
-    .flowList dd{
-        /*display:inline-block;*/
-        margin-left:10px;
-        min-width:250px;
-        line-height: 1.5;
-        min-width:100%;
-        min-height:15px;
-    }
-
-    .flowList dd a{
-    }
-
-    .mainContent
-    {
-        padding-left:5px;
-    }
-
-    .content .flowList p{
-        padding:0px;
-    }
-
-    .content .alignedsummary
-    {
-        margin: 15px;
-    }
-
-
-    .qmltype
-    {
-        text-align: center;
-        font-size: 120%;
-    }
-    .qmlreadonly
-    {
-        padding-left: 5px;
-        float: right;
-        color: #254117;
-    }
-
-    .qmldefault
-    {
-        padding-left: 5px;
-        float: right;
-        color: red;
-    }
-
-    .qmldoc
-    {
-    }
-
-    .generic .alphaChar{
-        margin-top:5px;
-    }
-
-    .generic .odd .alphaChar{
-        background-color: #F6F6F6;
-    }
-
-    .generic .even .alphaChar{
-        background-color: #FFFFFF;
-    }
-
-    .memItemRight{
-        padding: 0.25em 1.5em 0.25em 0;
-    }
-    .highlightedCode
-    {
-        margin: 1.0em;
-    }
-    .annotated td {
-        padding: 0.25em 0.5em 0.25em 0.5em;
-    }
-
-    .toc
-    {
-        font-size: 80%
-    }
-
-    .header .content .toc ul
-    {
-        padding-left: 0px;
-    }
-
-    .content .toc h3 {
-        border-bottom: 0px;
-        margin-top: 0px;
-    }
-
-    .content .toc h3 a:hover {
-        color: #00732F;
-        text-decoration: none;
-    }
-
-    .content .toc .level2
-    {
-        margin-left: 1.5em;
-    }
-
-    .content .toc .level3
-    {
-        margin-left: 3.0em;
-    }
-
-    .content ul li
-    {
-        background: url(../images/bullet_sq.png) no-repeat 0 0.7em;
-        padding-left: 1em
-    }
-
-    .content .toc li
-    {
-        background: url(../images/bullet_dn.png) no-repeat 0 5px;
-        padding-left: 1em
-    }
-
-    .relpage
-    {
-        -moz-border-radius: 7px 7px 7px 7px;
-        -webkit-border-radius: 7px 7px 7px 7px;
-        border-radius: 7px 7px 7px 7px;
-        border: 1px solid #DDDDDD;
-        padding: 25px 25px;
-        clear: both;
-    }
-    .relpage ul
-    {
-        float: none;
-        padding: 1.5em;
-    }
-
-    h3.fn, span.fn
-    {
-        -moz-border-radius:7px 7px 7px 7px;
-        -webkit-border-radius:7px 7px 7px 7px;
-        border-radius:7px 7px 7px 7px;
-        background-color: #F6F6F6;
-        border-width: 1px;
-        border-style: solid;
-        border-color: #E6E6E6;
-        font-weight: bold;
-        word-spacing:3px;
-        padding:3px 5px;
-    }
-
-    .functionIndex {
-        font-size:12pt;
-        word-spacing:10px;
-        margin-bottom:10px;
-        background-color: #F6F6F6;
-        border-width: 1px;
-        border-style: solid;
-        border-color: #E6E6E6;
-        -moz-border-radius: 7px 7px 7px 7px;
-        -webkit-border-radius: 7px 7px 7px 7px;
-        border-radius: 7px 7px 7px 7px;
-        width:100%;
-    }
-
-    .centerAlign
-    {
-        text-align:center;
-    }
-
-    .rightAlign
-    {
-        text-align:right;
-    }
-
-    .leftAlign
-    {
-        text-align:left;
-    }
-
-    .topAlign{
-        vertical-align:top
-    }
-
-    .functionIndex a{
-        display:inline-block;
-    }
-
-/* end content elements */
-/* footer elements */
-
-    .footer
-    {
-        color: #393735;
-        font-size: 0.75em;
-        text-align: center;
-        padding-top: 1.5em;
-        padding-bottom: 1em;
-        background-color: #E6E7E8;
-        margin: 0;
-    }
-    .footer p
-    {
-        margin: 0.25em
-    }
-    .small
-    {
-        font-size: 0.5em;
-    }
-/* end footer elements */
-
-    .item {
-      float: left;
-      position: relative;
-      width: 100%;
-      overflow: hidden;
-    }
-
-
-    .item .primary {
-      margin-right: 220px;
-      position: relative;
-    }
-
-    .item hr {
-      margin-left: -220px;
-    }
-
-    .item .secondary {
-      float: right;
-      width: 200px;
-      position: relative;
-    }
-
-    .item .cols {
-      clear: both;
-      display: block;
-    }
-
-    .item .cols .col {
-      float: left;
-      margin-left: 1.5%;
-    }
-
-    .item .cols .col.first {
-      margin-left: 0;
-    }
-
-    .item .cols.two .col {
-      width: 45%;
-    }
-
-    .item .box {
-      margin: 0 0 10px 0;
-    }
-
-    .item .box h3 {
-      margin: 0 0 10px 0;
-    }
-
-    .cols.unclear {
-        clear:none;
-    }
-}
-
-/* end of screen media */
-
-/* start of print media */
-
-@media print
-{
-    input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult
-    {
-        display: none;
-        background: none;
-    }
-    .content
-    {
-        background: none;
-        display: block;
-        width: 100%; margin: 0; float: none;
-    }
-}
-/* end of print media */
-
-
-/* modify the TOC layouts */
-div.toc ul {
-    padding-left: 20px;
-}
-div.toc li {
-    padding-left: 4px;
-}
-/* Remove the border around images*/
-a img
-{
-    border:none;
-}
-
-/*Add styling to the front pages*/
-
-.threecolumn_area
-{
-    padding-top: 20px;
-    padding-bottom: 20px;
-}
-.threecolumn_piece
-{
-    display: inline-block;
-    margin-left: 78px;
-    margin-top: 8px;
-    padding: 0;
-    vertical-align: top;
-    width: 25.5%;
-}
-div.threecolumn_piece ul {
-    list-style-type: none;
-    padding-left: 0px;
-    margin-top: 2px;
-}
-div.threecolumn_piece p {
-    margin-bottom: 7px;
-    color: #5C626E;
-    text-decoration: none;
-    font-weight: bold;
-}
-div.threecolumn_piece li {
-    padding-left: 0px;
-    margin-bottom: 5px;
-}
-div.threecolumn_piece a {
-    font-weight: normal;
-}
-/* Add style to guide page*/
-.fourcolumn_area
-{
-    padding-top: 20px;
-    padding-bottom: 20px;
-}
-.fourcolumn_piece
-{
-    display: inline-block;
-    margin-left: 35px;
-    margin-top: 8px;
-    padding: 0;
-    vertical-align: top;
-    width: 21.3%;
-}
-div.fourcolumn_piece ul {
-    list-style-type: none;
-    padding-left: 0px;
-    margin-top: 2px;
-}
-div.fourcolumn_piece p {
-    margin-bottom: 7px;
-    color: #40444D;
-    text-decoration: none;
-    font-weight: bold;
-}
-div.fourcolumn_piece li {
-    padding-left: 0px;
-    margin-bottom: 5px;
-}
-div.fourcolumn_piece a {
-    font-weight: normal;
-}
diff --git a/doc/src/examples/example-textballoons.qdoc b/doc/src/examples/example-textballoons.qdoc
deleted file mode 100644
index 75f218a841..0000000000
--- a/doc/src/examples/example-textballoons.qdoc
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file.  Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-/*!
-    \title Scenegraph Painted Item Example
-    \example quick/painteditem/textballoons
-
-    The Painted Item example shows how to use the QML Scene Graph framework to
-    implement custom scenegraph items using QPainter.
-
-    \image declarative-textballoons_example.png
-
-    The QQuickPaintedItem class is a class derived from QQuickItem for implementing
-    custom QML Scene Graph items using the QPainter interfaces.
-
-    The example consists of an item class, a plugin class and a QML file
-    to use this plugin. The \c TextBalloon class represents the individual
-    text balloons extending QQuickPaintedItem, the \c TextBalloonPlugin class
-    represents the skeleton code for a QtQuick plugin and the
-    \c textballoons.qml file is used to load the plugin and display the text
-    balloons.
-
-    We will focus on the \c TextBalloon class first and continue with the
-    \c textballoons.qml file. For an example on how to implement a QtQuick
-    plugin please look at \l{declarative/tutorials/extending/chapter6-plugins}
-    {Writing an Extension Plugin}
-
-    \section1 TextBalloon Class Declaration
-
-    The \c TextBalloon class inherits from QQuickPaintedItem. QQuickPaintedItem
-    is the base class for all QPainter based items in the QML Scene Graph
-    framework.
-
-    \snippet examples/quick/painteditem/textballoons/textballoon.h 0
-
-    To implement a QQuickPaintedItem you must implement QQuickPaintedIem's pure
-    virtual function \l {QQuickPaintedItem::}{paint()} which implements the
-    painting of the element.
-
-    \section1 TextBalloon Class Definition
-
-    We have to be sure to initialize the rightAligned property for a
-    TextBalloon item.
-
-    \snippet examples/quick/painteditem/textballoons/textballoon.cpp 0
-
-    Then we implement the \c paint() function which is automatically called by
-    the Scenegraph framework to paint the contents of the item. The function
-    paints the item in local coordinates.
-
-    \snippet examples/quick/painteditem/textballoons/textballoon.cpp 1
-
-    We start with setting the pen and brush on the item to define the look of
-    the item. After that we start drawing. Note that the \l {QQuickPaintedItem::}{boundingRect()}
-    item is called to draw depending on the size of the item. The rectangle
-    returned by the \l {QQuickPaintedItem::}{boundingRect()} function is the size
-    of the item as defined in the QML file.
-
-    \section1 textballoons.qml file
-
-    The Interface consists of two main parts. The scrollable area with the
-    textballoons and the controls button to add new balloons.
-
-    \section2 BalloonView
-
-    \snippet examples/quick/painteditem/textballoons/textballoons.qml 0
-
-    The balloonModel contains two elements at application start which will be
-    displayed by the balloonView. The balloonView alernates the TextBalloon
-    delegate items between left-aligned and right-aligned.
-
-    \section2 Controls
-
-    \snippet examples/quick/painteditem/textballoons/textballoons.qml 1
-
-    The controls part of the UI contains a rectangle with a MouseArea which
-    changes color when the mouse hovers over it. This control 'button' adds
-    a new element to the end of the model with a random width.
-
- */
diff --git a/doc/src/examples/examples-groups.qdoc b/doc/src/examples/examples-groups.qdoc
deleted file mode 100644
index 5d57de2a66..0000000000
--- a/doc/src/examples/examples-groups.qdoc
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file.  Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \title QML Examples - Internationalization
-    \example declarative/i18n
-    \image qml-i18n-example.png
-    \brief This is an internationalization example
-*/
-/*!
-    \title QML Examples - Positioners
-    \example declarative/positioners
-    \brief This is a positioners example
-    \image qml-positioners-example.png
-
-    This example demonstrates the positioners and some of their animations.
-*/
-/*!
-    \title QML Examples - Models and Views
-    \example declarative/modelviews
-    \brief This is a collection of QML examples
-    \image qml-modelviews-example.png
-
-    This is a collection of small QML examples relating to models and views. Each example is
-    a small QML file, usually containing or emphasizing a particular element or
-    feature. You can run and observe the behavior of each example.
-*/
-/*!
-    \title QML Examples - Touch Interaction
-    \example declarative/touchinteraction
-    \brief This is a collection of QML examples
-    \image qml-touchinteraction-example.png
-
-    This is a collection of  small QML examples relating to touch and multi-point touch. Each example is
-    a small QML file, usually containing or emphasizing a particular element or
-    feature. You can run and observe the behavior of each example.
-*/
diff --git a/doc/src/examples/examples-toys.qdoc b/doc/src/examples/examples-toys.qdoc
deleted file mode 100644
index fd3ed2332c..0000000000
--- a/doc/src/examples/examples-toys.qdoc
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file.  Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-/*!
-    \title QML Example - Samegame
-    \example declarative/samegame
-    \brief This example demonstrates creating a game with javascript game logic.
-    \image qml-samegame-demo-small.png
-*/
-
-/*!
-    \title QML Example - Snake
-    \example declarative/snake
-    \brief This example demonstrates creating a game using javascript game logic.
-    \image qml-snake-demo-small.png
-*/
-
-/*!
-    \title QML Example - Corkboards
-    \example declarative/toys/corkboards
-    \brief This example demonstrates using components inside a flickable.
-    \image qml-corkboards-example.png
-*/
-
diff --git a/doc/src/external-pages.qdoc b/doc/src/external-pages.qdoc
deleted file mode 100644
index 6063f7ecd0..0000000000
--- a/doc/src/external-pages.qdoc
+++ /dev/null
@@ -1,31 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file.  Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-\externalpage http://www.ecma-international.org/publications/standards/Ecma-262.htm
-\title External: ECMA-262
-*/
diff --git a/doc/src/images/3d-axis.png b/doc/src/images/3d-axis.png
deleted file mode 100644
index 1a587ffd28..0000000000
--- a/doc/src/images/3d-axis.png
+++ /dev/null
diff --git a/doc/src/images/BorderImage.png b/doc/src/images/BorderImage.png
deleted file mode 100644
index 651dd8aa76..0000000000
--- a/doc/src/images/BorderImage.png
+++ /dev/null
diff --git a/doc/src/images/ListViewHighlight.png b/doc/src/images/ListViewHighlight.png
deleted file mode 100644
index 02bf51dabf..0000000000
--- a/doc/src/images/ListViewHighlight.png
+++ /dev/null
diff --git a/doc/src/images/ListViewVertical.png b/doc/src/images/ListViewVertical.png
deleted file mode 100644
index e0b23d95e1..0000000000
--- a/doc/src/images/ListViewVertical.png
+++ /dev/null
diff --git a/doc/src/images/anchors.svg b/doc/src/images/anchors.svg
deleted file mode 100644
index 08b00ed6e3..0000000000
--- a/doc/src/images/anchors.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
-   id="svg1910"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   inkscape:export-filename="/home/mbrasser/work/Kinetic/ngui/doc/src/pics/anchors_example2.png"
-   inkscape:export-xdpi="189.65207"
-   inkscape:export-ydpi="189.65207"
-   sodipodi:docbase="/home/mbrasser/work/Kinetic/ngui/doc/src/pics"
-   sodipodi:docname="anchors.svg">
-  <defs
-     id="defs1912" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="431.57095"
-     inkscape:cy="413.38853"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1386"
-     inkscape:window-height="971"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata1915">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;stroke:black;stroke-width:0.52033526;stroke-miterlimit:4;stroke-dasharray:1.04067054, 0.52033527;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2807"
-       width="36.245155"
-       height="32.204544"
-       x="390.23157"
-       y="574.62024" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;stroke:black;stroke-width:0.44547796;stroke-miterlimit:4;stroke-dasharray:0.89095592, 0.44547796;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2809"
-       width="59.048447"
-       height="14.601732"
-       x="430.82993"
-       y="574.9483" />
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="399.40982"
-       y="594.76312"
-       id="text3696"><tspan
-         sodipodi:role="line"
-         id="tspan3698"
-         x="399.40982"
-         y="594.76312">pic</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="445.84048"
-       y="586.5423"
-       id="text3700"><tspan
-         sodipodi:role="line"
-         id="tspan3702"
-         x="445.84048"
-         y="586.5423">label</tspan></text>
-  </g>
-</svg>
diff --git a/doc/src/images/blur_example.png b/doc/src/images/blur_example.png
deleted file mode 100644
index 763b11224a..0000000000
--- a/doc/src/images/blur_example.png
+++ /dev/null
diff --git a/doc/src/images/content.png b/doc/src/images/content.png
deleted file mode 100644
index 47a98ac9a5..0000000000
--- a/doc/src/images/content.png
+++ /dev/null
diff --git a/doc/src/images/dial-example.gif b/doc/src/images/dial-example.gif
deleted file mode 100644
index 4e90ba91c4..0000000000
--- a/doc/src/images/dial-example.gif
+++ /dev/null
diff --git a/doc/src/images/edges.png b/doc/src/images/edges.png
deleted file mode 100644
index 211b1019a4..0000000000
--- a/doc/src/images/edges.png
+++ /dev/null
diff --git a/doc/src/images/edges.svg b/doc/src/images/edges.svg
deleted file mode 100644
index 25698ca40f..0000000000
--- a/doc/src/images/edges.svg
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/home/mbrasser"
-   sodipodi:docname="edges.svg">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Mstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.4) translate(10,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3856"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8583315"
-     inkscape:cx="372.04724"
-     inkscape:cy="596.15198"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1279"
-     inkscape:window-height="969"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:#0ca9fa;fill-opacity:1;stroke:black;stroke-width:0.04639034;stroke-miterlimit:4;stroke-dasharray:0.09278069, 0.04639034;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1872"
-       width="33.656742"
-       height="39.808346"
-       x="208.86543"
-       y="390.22763"
-       rx="5"
-       ry="5" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 225.51888,380.99149 C 225.51888,439.06733 225.86873,439.06733 225.86873,439.06733"
-       id="path2760" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 242.97392,380.99149 C 242.97392,439.06733 243.32377,439.06733 243.32377,439.06733"
-       id="path3647" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 208.33832,380.99149 C 208.33832,439.06733 208.68817,439.06733 208.68817,439.06733"
-       id="path3649" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 195.91848,409.67956 C 256.44329,409.67956 256.09344,409.67956 256.09344,409.67956"
-       id="path3651" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 195.91848,429.97112 C 256.44329,429.97112 256.09344,429.97112 256.09344,429.97112"
-       id="path3653" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 195.91848,390.78742 C 256.44329,390.78742 256.09344,390.78742 256.09344,390.78742"
-       id="path3655" />
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="258.54242"
-       y="393.58627"
-       id="text3657"><tspan
-         sodipodi:role="line"
-         id="tspan3659"
-         x="258.54242"
-         y="393.58627"
-         style="font-size:10px">Top</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="258.78955"
-       y="412.28455"
-       id="text3661"><tspan
-         sodipodi:role="line"
-         id="tspan3663"
-         x="258.78955"
-         y="412.28455"
-         style="font-size:10px">VerticalCenter</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="260.18896"
-       y="433.27582"
-       id="text3665"><tspan
-         sodipodi:role="line"
-         id="tspan3667"
-         x="260.18896"
-         y="433.27582"
-         style="font-size:10px">Bottom</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="198.96443"
-       y="376.24954"
-       id="text3669"><tspan
-         sodipodi:role="line"
-         id="tspan3671"
-         x="198.96443"
-         y="376.24954"
-         style="font-size:10px">Left</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="230.55408"
-       y="375.39383"
-       id="text3673"><tspan
-         sodipodi:role="line"
-         id="tspan3675"
-         x="230.55408"
-         y="375.39383"
-         style="font-size:10px">Right</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="186.71951"
-       y="355.25827"
-       id="text3677"><tspan
-         sodipodi:role="line"
-         id="tspan3679"
-         x="186.71951"
-         y="355.25827"
-         style="font-size:10px">HorizontalCenter</tspan></text>
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow1Mstart)"
-       d="M 224.2567,375.39382 C 227.40539,356.85154 227.75525,357.20139 227.75525,357.20139"
-       id="path3681" />
-  </g>
-</svg>
diff --git a/doc/src/images/edges_examples.svg b/doc/src/images/edges_examples.svg
deleted file mode 100644
index 31e9901f07..0000000000
--- a/doc/src/images/edges_examples.svg
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
-   id="svg3885"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   inkscape:export-filename="/home/mbrasser/edge4.png"
-   inkscape:export-xdpi="189.65207"
-   inkscape:export-ydpi="189.65207"
-   sodipodi:docbase="/home/mbrasser/work/Kinetic/ngui/doc/src/pics"
-   sodipodi:docname="edges_examples.svg">
-  <defs
-     id="defs3887" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="162.62912"
-     inkscape:cy="591.92069"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="928"
-     inkscape:window-height="624"
-     inkscape:window-x="0"
-     inkscape:window-y="495" />
-  <metadata
-     id="metadata3890">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:#0ca9fa;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3893"
-       width="50"
-       height="50"
-       x="100"
-       y="414.36218" />
-    <rect
-       style="opacity:1;fill:#fa0c2a;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3895"
-       width="104"
-       height="50"
-       x="150"
-       y="414.36218" />
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="109"
-       y="443.65125"
-       id="text3897"><tspan
-         sodipodi:role="line"
-         id="tspan3899"
-         x="109"
-         y="443.65125">rect1</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="186.54297"
-       y="443.65125"
-       id="text3901"><tspan
-         sodipodi:role="line"
-         id="tspan3903"
-         x="186.54297"
-         y="443.65125">rect2</tspan></text>
-    <rect
-       style="opacity:1;fill:#0ca9fa;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3905"
-       width="50"
-       height="50"
-       x="254"
-       y="414.36218" />
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="263"
-       y="443.65125"
-       id="text3907"><tspan
-         sodipodi:role="line"
-         id="tspan3909"
-         x="263"
-         y="443.65125">rect3</tspan></text>
-  </g>
-</svg>
diff --git a/doc/src/images/edges_qml.svg b/doc/src/images/edges_qml.svg
deleted file mode 100644
index 1814ec6b20..0000000000
--- a/doc/src/images/edges_qml.svg
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/home/mbrasser/work/Kinetic/ngui/doc/src/pics"
-   sodipodi:docname="edges_qml.svg"
-   inkscape:export-filename="/home/mbrasser/edges_qml.png"
-   inkscape:export-xdpi="284.45999"
-   inkscape:export-ydpi="284.45999">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Mstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.4) translate(10,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3856"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8583315"
-     inkscape:cx="372.04724"
-     inkscape:cy="596.15198"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1279"
-     inkscape:window-height="969"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:#0ca9fa;fill-opacity:1;stroke:black;stroke-width:0.04639034;stroke-miterlimit:4;stroke-dasharray:0.09278069, 0.04639034;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1872"
-       width="33.656742"
-       height="39.808346"
-       x="208.86543"
-       y="390.22763"
-       rx="5"
-       ry="5" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 225.51888,380.99149 C 225.51888,439.06733 225.86873,439.06733 225.86873,439.06733"
-       id="path2760" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 242.97392,380.99149 C 242.97392,439.06733 243.32377,439.06733 243.32377,439.06733"
-       id="path3647" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 208.33832,380.99149 C 208.33832,439.06733 208.68817,439.06733 208.68817,439.06733"
-       id="path3649" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 195.91848,409.67956 C 256.44329,409.67956 256.09344,409.67956 256.09344,409.67956"
-       id="path3651" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 195.91848,429.97112 C 256.44329,429.97112 256.09344,429.97112 256.09344,429.97112"
-       id="path3653" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 195.91848,390.78742 C 256.44329,390.78742 256.09344,390.78742 256.09344,390.78742"
-       id="path3655" />
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="258.54242"
-       y="393.58627"
-       id="text3657"><tspan
-         sodipodi:role="line"
-         id="tspan3659"
-         x="258.54242"
-         y="393.58627"
-         style="font-size:10px">top</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="258.78955"
-       y="412.28455"
-       id="text3661"><tspan
-         sodipodi:role="line"
-         id="tspan3663"
-         x="258.78955"
-         y="412.28455"
-         style="font-size:10px">verticalCenter</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="260.18896"
-       y="433.27582"
-       id="text3665"><tspan
-         sodipodi:role="line"
-         id="tspan3667"
-         x="260.18896"
-         y="433.27582"
-         style="font-size:10px">bottom</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="200.96443"
-       y="376.24954"
-       id="text3669"><tspan
-         sodipodi:role="line"
-         id="tspan3671"
-         x="200.96443"
-         y="376.24954"
-         style="font-size:10px">left</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="232.55408"
-       y="375.39383"
-       id="text3673"><tspan
-         sodipodi:role="line"
-         id="tspan3675"
-         x="232.55408"
-         y="375.39383"
-         style="font-size:10px">right</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="190.71951"
-       y="355.25827"
-       id="text3677"><tspan
-         sodipodi:role="line"
-         id="tspan3679"
-         x="190.71951"
-         y="355.25827"
-         style="font-size:10px">horizontalCenter</tspan></text>
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#Arrow1Mstart);stroke-opacity:1"
-       d="M 226.2567,375.39382 C 229.40539,356.85154 229.75525,357.20139 229.75525,357.20139"
-       id="path3681" />
-  </g>
-</svg>
diff --git a/doc/src/images/highlight.gif b/doc/src/images/highlight.gif
deleted file mode 100644
index fbef256f54..0000000000
--- a/doc/src/images/highlight.gif
+++ /dev/null
diff --git a/doc/src/images/margins_qml.svg b/doc/src/images/margins_qml.svg
deleted file mode 100644
index 1f0ff022bb..0000000000
--- a/doc/src/images/margins_qml.svg
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/home/mbrasser/work/Kinetic/ngui/doc/src/pics"
-   sodipodi:docname="margins_qml.svg"
-   inkscape:export-filename="/home/mbrasser/edges_qml.png"
-   inkscape:export-xdpi="284.45999"
-   inkscape:export-ydpi="284.45999">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow1Send"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Send"
-       style="overflow:visible;">
-      <path
-         id="path2976"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.2) rotate(180) translate(6,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Sstart"
-       style="overflow:visible">
-      <path
-         id="path2979"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.2) translate(6,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Mstart"
-       style="overflow:visible">
-      <path
-         id="path3850"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.4) translate(10,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3856"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8583315"
-     inkscape:cx="372.04724"
-     inkscape:cy="596.15198"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1279"
-     inkscape:window-height="969"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:#0ca9fa;fill-opacity:1;stroke:black;stroke-width:0.04639034;stroke-miterlimit:4;stroke-dasharray:0.09278069, 0.04639034;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1872"
-       width="33.656742"
-       height="39.808346"
-       x="208.86543"
-       y="390.22763"
-       rx="5"
-       ry="5" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.02602077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.02602088, 1.02602088;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 252.98692,377.00435 C 252.98692,443.05433 253.31077,443.05433 253.31077,443.05433"
-       id="path3647" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.02601969;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.02602007, 1.02602007;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 198.35134,377.00433 C 198.35134,443.05431 198.67515,443.05431 198.67515,443.05431"
-       id="path3649" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.02421367;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.02421381, 1.02421381;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 193.94282,437.97112 C 257.43421,437.97112 257.06721,437.97112 257.06721,437.97112"
-       id="path3653" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.02421367;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.02421381, 1.02421381;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 193.94282,380.78742 C 257.43421,380.78742 257.06721,380.78742 257.06721,380.78742"
-       id="path3655" />
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="260.29169"
-       y="388.78741"
-       id="text1911"><tspan
-         sodipodi:role="line"
-         id="tspan1913"
-         x="260.29169"
-         y="388.78741"
-         style="font-size:10px">topMargin</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="259.65204"
-       y="437.27798"
-       id="text1915"><tspan
-         sodipodi:role="line"
-         id="tspan1917"
-         x="259.65204"
-         y="437.27798"
-         style="font-size:10px">bottomMargin</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="170.07939"
-       y="454.4209"
-       id="text1919"><tspan
-         sodipodi:role="line"
-         id="tspan1921"
-         x="170.07939"
-         y="454.4209"
-         style="font-size:10px">leftMargin</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="228.47504"
-       y="454.4209"
-       id="text1923"><tspan
-         sodipodi:role="line"
-         id="tspan1925"
-         x="228.47504"
-         y="454.4209"
-         style="font-size:10px">rightMargin</tspan></text>
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:0.92020172px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#Arrow1Sstart);marker-end:url(#Arrow1Send);stroke-opacity:1"
-       d="M 225.6938,382.51213 C 225.6938,388.91693 225.6938,388.91693 225.6938,388.91693"
-       id="path1929" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:0.92007709px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#Arrow1Sstart);marker-end:url(#Arrow1Send);stroke-opacity:1"
-       d="M 225.6938,430.56703 C 225.6938,436.97192 225.6938,436.97192 225.6938,436.97192"
-       id="path3000" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#Arrow1Sstart);marker-mid:none;marker-end:url(#Arrow1Send);stroke-opacity:1"
-       d="M 201.16631,410.1318 C 207.81355,410.1318 207.81355,410.1318 207.81355,410.1318"
-       id="path3002" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#Arrow1Sstart);marker-mid:none;marker-end:url(#Arrow1Send);stroke-opacity:1"
-       d="M 244.02348,410.1318 C 250.67072,410.1318 250.67072,410.1318 250.67072,410.1318"
-       id="path3889" />
-  </g>
-</svg>
diff --git a/doc/src/images/particles.gif b/doc/src/images/particles.gif
deleted file mode 100644
index 763a8a8616..0000000000
--- a/doc/src/images/particles.gif
+++ /dev/null
diff --git a/doc/src/images/positioner-add.gif b/doc/src/images/positioner-add.gif
deleted file mode 100644
index 86e9247073..0000000000
--- a/doc/src/images/positioner-add.gif
+++ /dev/null
diff --git a/doc/src/images/positioner-move.gif b/doc/src/images/positioner-move.gif
deleted file mode 100644
index 1825c2282b..0000000000
--- a/doc/src/images/positioner-move.gif
+++ /dev/null
diff --git a/doc/src/images/positioner-remove.gif b/doc/src/images/positioner-remove.gif
deleted file mode 100644
index 708651190c..0000000000
--- a/doc/src/images/positioner-remove.gif
+++ /dev/null
diff --git a/doc/src/images/qeasingcurve-cosinecurve.png b/doc/src/images/qeasingcurve-cosinecurve.png
deleted file mode 100644
index 8cee97800e..0000000000
--- a/doc/src/images/qeasingcurve-cosinecurve.png
+++ /dev/null
diff --git a/doc/src/images/qeasingcurve-incurve.png b/doc/src/images/qeasingcurve-incurve.png
deleted file mode 100644
index 578259e4a5..0000000000
--- a/doc/src/images/qeasingcurve-incurve.png
+++ /dev/null
diff --git a/doc/src/images/qeasingcurve-outcurve.png b/doc/src/images/qeasingcurve-outcurve.png
deleted file mode 100644
index 295b47147c..0000000000
--- a/doc/src/images/qeasingcurve-outcurve.png
+++ /dev/null
diff --git a/doc/src/images/qeasingcurve-sinecurve.png b/doc/src/images/qeasingcurve-sinecurve.png
deleted file mode 100644
index 6134a0159f..0000000000
--- a/doc/src/images/qeasingcurve-sinecurve.png
+++ /dev/null
diff --git a/doc/src/images/qml-context-object.png b/doc/src/images/qml-context-object.png
deleted file mode 100644
index 1b91aff651..0000000000
--- a/doc/src/images/qml-context-object.png
+++ /dev/null
diff --git a/doc/src/images/qml-context-tree.png b/doc/src/images/qml-context-tree.png
deleted file mode 100644
index 6bba5f4f05..0000000000
--- a/doc/src/images/qml-context-tree.png
+++ /dev/null
diff --git a/doc/src/images/qml-context.png b/doc/src/images/qml-context.png
deleted file mode 100644
index bdf2ecd2c6..0000000000
--- a/doc/src/images/qml-context.png
+++ /dev/null
diff --git a/doc/src/images/qml-corkboards-example.png b/doc/src/images/qml-corkboards-example.png
deleted file mode 100644
index 657ff5cb17..0000000000
--- a/doc/src/images/qml-corkboards-example.png
+++ /dev/null
diff --git a/doc/src/images/qml-flickr-demo-small.png b/doc/src/images/qml-flickr-demo-small.png
deleted file mode 100644
index 370ffcf850..0000000000
--- a/doc/src/images/qml-flickr-demo-small.png
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-clip-aqu.png b/doc/src/images/qml-item-canvas-clip-aqu.png
deleted file mode 100644
index d0696d6708..0000000000
--- a/doc/src/images/qml-item-canvas-clip-aqu.png
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-clip-complex.png b/doc/src/images/qml-item-canvas-clip-complex.png
deleted file mode 100644
index cb582bad41..0000000000
--- a/doc/src/images/qml-item-canvas-clip-complex.png
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-clip.png b/doc/src/images/qml-item-canvas-clip.png
deleted file mode 100644
index c397f5e860..0000000000
--- a/doc/src/images/qml-item-canvas-clip.png
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-closepath.gif b/doc/src/images/qml-item-canvas-closepath.gif
deleted file mode 100644
index e32024a049..0000000000
--- a/doc/src/images/qml-item-canvas-closepath.gif
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-composite.png b/doc/src/images/qml-item-canvas-composite.png
deleted file mode 100644
index 6e20efac0d..0000000000
--- a/doc/src/images/qml-item-canvas-composite.png
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-lineStrokeTo.gif b/doc/src/images/qml-item-canvas-lineStrokeTo.gif
deleted file mode 100644
index e05aa00257..0000000000
--- a/doc/src/images/qml-item-canvas-lineStrokeTo.gif
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-linecap.png b/doc/src/images/qml-item-canvas-linecap.png
deleted file mode 100644
index 72ecce5313..0000000000
--- a/doc/src/images/qml-item-canvas-linecap.png
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-pattern.png b/doc/src/images/qml-item-canvas-pattern.png
deleted file mode 100644
index 6b593bcf0e..0000000000
--- a/doc/src/images/qml-item-canvas-pattern.png
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-rectangles.gif b/doc/src/images/qml-item-canvas-rectangles.gif
deleted file mode 100644
index 3b44cc5551..0000000000
--- a/doc/src/images/qml-item-canvas-rectangles.gif
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-scaley.png b/doc/src/images/qml-item-canvas-scaley.png
deleted file mode 100644
index 61462b9adc..0000000000
--- a/doc/src/images/qml-item-canvas-scaley.png
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-skewx.png b/doc/src/images/qml-item-canvas-skewx.png
deleted file mode 100644
index c9bcb6715c..0000000000
--- a/doc/src/images/qml-item-canvas-skewx.png
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-skewy.png b/doc/src/images/qml-item-canvas-skewy.png
deleted file mode 100644
index 594ac842a4..0000000000
--- a/doc/src/images/qml-item-canvas-skewy.png
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-text.png b/doc/src/images/qml-item-canvas-text.png
deleted file mode 100644
index 6983047bbe..0000000000
--- a/doc/src/images/qml-item-canvas-text.png
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-translate.png b/doc/src/images/qml-item-canvas-translate.png
deleted file mode 100644
index 7bb3ae7560..0000000000
--- a/doc/src/images/qml-item-canvas-translate.png
+++ /dev/null
diff --git a/doc/src/images/qml-item-canvas-translatey.png b/doc/src/images/qml-item-canvas-translatey.png
deleted file mode 100644
index 9196bf5919..0000000000
--- a/doc/src/images/qml-item-canvas-translatey.png
+++ /dev/null
diff --git a/doc/src/images/qml-listview-snippet.png b/doc/src/images/qml-listview-snippet.png
deleted file mode 100644
index 0ee0ffcd0e..0000000000
--- a/doc/src/images/qml-listview-snippet.png
+++ /dev/null
diff --git a/doc/src/images/qml-maroon-demo-icon.png b/doc/src/images/qml-maroon-demo-icon.png
deleted file mode 100644
index d8baff894d..0000000000
--- a/doc/src/images/qml-maroon-demo-icon.png
+++ /dev/null
diff --git a/doc/src/images/qml-minehunt-demo-small.png b/doc/src/images/qml-minehunt-demo-small.png
deleted file mode 100644
index e5badac88c..0000000000
--- a/doc/src/images/qml-minehunt-demo-small.png
+++ /dev/null
diff --git a/doc/src/images/qml-scope.png b/doc/src/images/qml-scope.png
deleted file mode 100644
index be025c8c3d..0000000000
--- a/doc/src/images/qml-scope.png
+++ /dev/null
diff --git a/doc/src/images/qml-snake-demo-small.png b/doc/src/images/qml-snake-demo-small.png
deleted file mode 100644
index 23a7b3b304..0000000000
--- a/doc/src/images/qml-snake-demo-small.png
+++ /dev/null
diff --git a/doc/src/images/qml-texteditor5_newfile.png b/doc/src/images/qml-texteditor5_newfile.png
deleted file mode 100644
index e49394166d..0000000000
--- a/doc/src/images/qml-texteditor5_newfile.png
+++ /dev/null
diff --git a/doc/src/images/qml-twitter-demo-small.png b/doc/src/images/qml-twitter-demo-small.png
deleted file mode 100644
index b55cebab95..0000000000
--- a/doc/src/images/qml-twitter-demo-small.png
+++ /dev/null
diff --git a/doc/src/images/qml-webbrowser-demo-small.png b/doc/src/images/qml-webbrowser-demo-small.png
deleted file mode 100644
index 6c5d57d536..0000000000
--- a/doc/src/images/qml-webbrowser-demo-small.png
+++ /dev/null
diff --git a/doc/src/images/qml-xmllistmodel-example.png b/doc/src/images/qml-xmllistmodel-example.png
deleted file mode 100644
index be2d15d342..0000000000
--- a/doc/src/images/qml-xmllistmodel-example.png
+++ /dev/null
diff --git a/doc/src/images/qtlogo.png b/doc/src/images/qtlogo.png
deleted file mode 100644
index 399bd0b1d9..0000000000
--- a/doc/src/images/qtlogo.png
+++ /dev/null
diff --git a/doc/src/images/reflection_example.png b/doc/src/images/reflection_example.png
deleted file mode 100644
index fd9bb48022..0000000000
--- a/doc/src/images/reflection_example.png
+++ /dev/null
diff --git a/doc/src/images/scalegrid.svg b/doc/src/images/scalegrid.svg
deleted file mode 100644
index e386f3d7bb..0000000000
--- a/doc/src/images/scalegrid.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/home/mbrasser/work/Kinetic/ngui/doc/src/pics"
-   sodipodi:docname="scalegrid.svg"
-   inkscape:export-filename="/home/mbrasser/work/Kinetic/ngui/doc/src/pics/scalegrid.png"
-   inkscape:export-xdpi="189.65207"
-   inkscape:export-ydpi="189.65207">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="50"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.2163554"
-     inkscape:cx="173.89302"
-     inkscape:cy="703.69531"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="false"
-     inkscape:guide-bbox="false"
-     inkscape:window-width="1409"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:red;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1876"
-       width="45.104"
-       height="45.137001"
-       x="119.16868"
-       y="301.00308"
-       rx="5"
-       ry="5" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:0.3965202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.79304035, 0.39652018;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 157.02483,295.52571 C 157.02483,352.04784 157.02483,352.04784 157.02483,352.04784"
-       id="path2766" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:0.39652267;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.79304534, 0.39652268;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 126.2,295.64284 C 126.2,352.16567 126.2,352.16567 126.2,352.16567"
-       id="path2768" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:0.39652267;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.79304534, 0.39652268;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 169.05321,308.25967 C 112.53038,308.25967 112.53038,308.25967 112.53038,308.25967"
-       id="path2770" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:0.39652267;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.79304534, 0.39652268;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 169.08024,339.77238 C 112.55741,339.77238 112.55741,339.77238 112.55741,339.77238"
-       id="path2772" />
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="115.2857"
-       y="303.60583"
-       id="text2774"><tspan
-         sodipodi:role="line"
-         id="tspan2776"
-         x="115.2857"
-         y="303.60583">1</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="137.19142"
-       y="303.60583"
-       id="text2782"><tspan
-         sodipodi:role="line"
-         id="tspan2784"
-         x="137.19142"
-         y="303.60583"
-         style="font-family:Arial Black">2</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="161.56842"
-       y="303.45935"
-       id="text2786"><tspan
-         sodipodi:role="line"
-         id="tspan2788"
-         x="161.56842"
-         y="303.45935">3</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="114.72613"
-       y="327.00702"
-       id="text2790"><tspan
-         sodipodi:role="line"
-         id="tspan2792"
-         x="114.72613"
-         y="327.00702"
-         style="font-family:Arial Black">4</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="137.12404"
-       y="326.86053"
-       id="text2794"><tspan
-         sodipodi:role="line"
-         id="tspan2796"
-         x="137.12404"
-         y="326.86053"
-         style="font-family:Arial Black">5</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="161.49518"
-       y="326.86053"
-       id="text2798"><tspan
-         sodipodi:role="line"
-         id="tspan2800"
-         x="161.49518"
-         y="326.86053"
-         style="font-family:Arial Black">6</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="114.70855"
-       y="351.25809"
-       id="text2802"><tspan
-         sodipodi:role="line"
-         id="tspan2804"
-         x="114.70855"
-         y="351.25809"
-         style="font-family:Arial Black">7</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="137.08595"
-       y="351.1116"
-       id="text2806"><tspan
-         sodipodi:role="line"
-         id="tspan2808"
-         x="137.08595"
-         y="351.1116"
-         style="font-family:Arial Black">8</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="161.58307"
-       y="351.1116"
-       id="text2810"><tspan
-         sodipodi:role="line"
-         id="tspan2812"
-         x="161.58307"
-         y="351.1116"
-         style="font-family:Arial Black">9</tspan></text>
-  </g>
-</svg>
diff --git a/doc/src/images/shadow_example.png b/doc/src/images/shadow_example.png
deleted file mode 100644
index 6214620f0c..0000000000
--- a/doc/src/images/shadow_example.png
+++ /dev/null
diff --git a/doc/src/images/squish-transform.png b/doc/src/images/squish-transform.png
deleted file mode 100644
index 0eb848edc2..0000000000
--- a/doc/src/images/squish-transform.png
+++ /dev/null
diff --git a/doc/src/images/squish.png b/doc/src/images/squish.png
deleted file mode 100644
index 73bf2920de..0000000000
--- a/doc/src/images/squish.png
+++ /dev/null
diff --git a/doc/src/images/switch-example.gif b/doc/src/images/switch-example.gif
deleted file mode 100644
index 3d6582fecc..0000000000
--- a/doc/src/images/switch-example.gif
+++ /dev/null
diff --git a/doc/src/images/webview.png b/doc/src/images/webview.png
deleted file mode 100644
index 0d24586587..0000000000
--- a/doc/src/images/webview.png
+++ /dev/null
diff --git a/doc/src/images/qml-calculator-example-small.png b/examples/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png
index af67f63dd1..af67f63dd1 100644
--- a/doc/src/images/qml-calculator-example-small.png
+++ b/examples/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png
diff --git a/doc/src/images/qml-affectors-example.png b/examples/particles/affectors/doc/images/qml-affectors-example.png
index 748afa65e5..748afa65e5 100644
--- a/doc/src/images/qml-affectors-example.png
+++ b/examples/particles/affectors/doc/images/qml-affectors-example.png
diff --git a/doc/src/images/qml-customparticle-example.png b/examples/particles/customparticle/doc/images/qml-customparticle-example.png
index e23c6c8efc..e23c6c8efc 100644
--- a/doc/src/images/qml-customparticle-example.png
+++ b/examples/particles/customparticle/doc/images/qml-customparticle-example.png
diff --git a/doc/src/images/qml-emitters-example.png b/examples/particles/emitters/doc/images/qml-emitters-example.png
index 0025afd30c..0025afd30c 100644
--- a/doc/src/images/qml-emitters-example.png
+++ b/examples/particles/emitters/doc/images/qml-emitters-example.png
diff --git a/doc/src/images/qml-imageparticle-example.png b/examples/particles/imageparticle/doc/images/qml-imageparticle-example.png
index 9e44abe4fb..9e44abe4fb 100644
--- a/doc/src/images/qml-imageparticle-example.png
+++ b/examples/particles/imageparticle/doc/images/qml-imageparticle-example.png
diff --git a/doc/src/images/qml-system-example.png b/examples/particles/system/doc/images/qml-system-example.png
index 1a317c4be8..1a317c4be8 100644
--- a/doc/src/images/qml-system-example.png
+++ b/examples/particles/system/doc/images/qml-system-example.png
diff --git a/doc/src/images/qml-dynamicscene-example.png b/examples/qml/dynamicscene/doc/images/qml-dynamicscene-example.png
index 38260a7d3f..38260a7d3f 100644
--- a/doc/src/images/qml-dynamicscene-example.png
+++ b/examples/qml/dynamicscene/doc/images/qml-dynamicscene-example.png
diff --git a/doc/src/images/qml-i18n-example.png b/examples/qml/i18n/doc/images/qml-i18n-example.png
index 02f645e702..02f645e702 100644
--- a/doc/src/images/qml-i18n-example.png
+++ b/examples/qml/i18n/doc/images/qml-i18n-example.png
diff --git a/doc/src/images/qml-animations-example.png b/examples/quick/animation/doc/images/qml-animations-example.png
index dbaf2e4d3b..dbaf2e4d3b 100644
--- a/doc/src/images/qml-animations-example.png
+++ b/examples/quick/animation/doc/images/qml-animations-example.png
diff --git a/doc/src/images/qml-canvas-example.png b/examples/quick/canvas/doc/images/qml-canvas-example.png
index 2651ad6ff5..2651ad6ff5 100644
--- a/doc/src/images/qml-canvas-example.png
+++ b/examples/quick/canvas/doc/images/qml-canvas-example.png
diff --git a/doc/src/images/qml-draganddrop-example.png b/examples/quick/draganddrop/doc/images/qml-draganddrop-example.png
index b64f4d63a4..b64f4d63a4 100644
--- a/doc/src/images/qml-draganddrop-example.png
+++ b/examples/quick/draganddrop/doc/images/qml-draganddrop-example.png
diff --git a/doc/src/images/qml-imageelements-example.png b/examples/quick/imageelements/doc/images/qml-imageelements-example.png
index 57b23a1f05..57b23a1f05 100644
--- a/doc/src/images/qml-imageelements-example.png
+++ b/examples/quick/imageelements/doc/images/qml-imageelements-example.png
diff --git a/doc/src/images/qml-keyinteraction-example.png b/examples/quick/keyinteraction/doc/images/qml-keyinteraction-example.png
index 7f4dd77907..7f4dd77907 100644
--- a/doc/src/images/qml-keyinteraction-example.png
+++ b/examples/quick/keyinteraction/doc/images/qml-keyinteraction-example.png
diff --git a/doc/src/images/qml-modelviews-example.png b/examples/quick/modelviews/doc/images/qml-modelviews-example.png
index b40334653d..b40334653d 100644
--- a/doc/src/images/qml-modelviews-example.png
+++ b/examples/quick/modelviews/doc/images/qml-modelviews-example.png
diff --git a/doc/src/images/qml-mousearea-example.png b/examples/quick/mousearea/doc/images/qml-mousearea-example.png
index d93dc92d74..d93dc92d74 100644
--- a/doc/src/images/qml-mousearea-example.png
+++ b/examples/quick/mousearea/doc/images/qml-mousearea-example.png
diff --git a/doc/src/images/declarative-textballoons_example.png b/examples/quick/painteditem/textballoons/doc/images/declarative-textballoons_example.png
index d572de597c..d572de597c 100644
--- a/doc/src/images/declarative-textballoons_example.png
+++ b/examples/quick/painteditem/textballoons/doc/images/declarative-textballoons_example.png
diff --git a/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc b/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc
index aeaf1cec1a..910072aee4 100644
--- a/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc
+++ b/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc
@@ -25,8 +25,82 @@
 **
 ****************************************************************************/
 
+
 /*!
-    \title QtQuick Examples - Painted Text Balloons
+    \title Scenegraph Painted Item Example
     \example quick/painteditem/textballoons
-    \brief This is a simple example that draws text balloons using QPainter
-*/
+
+    The Painted Item example shows how to use the QML Scene Graph framework to
+    implement custom scenegraph items using QPainter.
+
+    \image declarative-textballoons_example.png
+
+    The QQuickPaintedItem class is a class derived from QQuickItem for implementing
+    custom QML Scene Graph items using the QPainter interfaces.
+
+    The example consists of an item class, a plugin class and a QML file
+    to use this plugin. The \c TextBalloon class represents the individual
+    text balloons extending QQuickPaintedItem, the \c TextBalloonPlugin class
+    represents the skeleton code for a QtQuick plugin and the
+    \c textballoons.qml file is used to load the plugin and display the text
+    balloons.
+
+    We will focus on the \c TextBalloon class first and continue with the
+    \c textballoons.qml file. For an example on how to implement a QtQuick
+    plugin please look at \l{declarative/tutorials/extending/chapter6-plugins}
+    {Writing an Extension Plugin}
+
+    \section1 TextBalloon Class Declaration
+
+    The \c TextBalloon class inherits from QQuickPaintedItem. QQuickPaintedItem
+    is the base class for all QPainter based items in the QML Scene Graph
+    framework.
+
+    \snippet examples/quick/painteditem/textballoons/textballoon.h 0
+
+    To implement a QQuickPaintedItem you must implement QQuickPaintedIem's pure
+    virtual function \l {QQuickPaintedItem::}{paint()} which implements the
+    painting of the element.
+
+    \section1 TextBalloon Class Definition
+
+    We have to be sure to initialize the rightAligned property for a
+    TextBalloon item.
+
+    \snippet examples/quick/painteditem/textballoons/textballoon.cpp 0
+
+    Then we implement the \c paint() function which is automatically called by
+    the Scenegraph framework to paint the contents of the item. The function
+    paints the item in local coordinates.
+
+    \snippet examples/quick/painteditem/textballoons/textballoon.cpp 1
+
+    We start with setting the pen and brush on the item to define the look of
+    the item. After that we start drawing. Note that the \l {QQuickPaintedItem::}{boundingRect()}
+    item is called to draw depending on the size of the item. The rectangle
+    returned by the \l {QQuickPaintedItem::}{boundingRect()} function is the size
+    of the item as defined in the QML file.
+
+    \section1 textballoons.qml file
+
+    The Interface consists of two main parts. The scrollable area with the
+    textballoons and the controls button to add new balloons.
+
+    \section2 BalloonView
+
+    \snippet examples/quick/painteditem/textballoons/textballoons.qml 0
+
+    The balloonModel contains two elements at application start which will be
+    displayed by the balloonView. The balloonView alernates the TextBalloon
+    delegate items between left-aligned and right-aligned.
+
+    \section2 Controls
+
+    \snippet examples/quick/painteditem/textballoons/textballoons.qml 1
+
+    The controls part of the UI contains a rectangle with a MouseArea which
+    changes color when the mouse hovers over it. This control 'button' adds
+    a new element to the end of the model with a random width.
+
+ */
+
diff --git a/doc/src/images/qml-positioners-example.png b/examples/quick/positioners/doc/images/qml-positioners-example.png
index 0c02f4a56a..0c02f4a56a 100644
--- a/doc/src/images/qml-positioners-example.png
+++ b/examples/quick/positioners/doc/images/qml-positioners-example.png
diff --git a/doc/src/images/qml-righttoleft-example.png b/examples/quick/righttoleft/doc/images/qml-righttoleft-example.png
index 03c3c48f10..03c3c48f10 100644
--- a/doc/src/images/qml-righttoleft-example.png
+++ b/examples/quick/righttoleft/doc/images/qml-righttoleft-example.png
diff --git a/doc/src/images/qml-shadereffects-example.png b/examples/quick/shadereffects/doc/images/qml-shadereffects-example.png
index aba4e1faa9..aba4e1faa9 100644
--- a/doc/src/images/qml-shadereffects-example.png
+++ b/examples/quick/shadereffects/doc/images/qml-shadereffects-example.png
diff --git a/doc/src/images/qml-text-example.png b/examples/quick/text/doc/images/qml-text-example.png
index 71425d1522..71425d1522 100644
--- a/doc/src/images/qml-text-example.png
+++ b/examples/quick/text/doc/images/qml-text-example.png
diff --git a/doc/src/images/qml-threading-example.png b/examples/quick/threading/doc/images/qml-threading-example.png
index 6ed79ab190..6ed79ab190 100644
--- a/doc/src/images/qml-threading-example.png
+++ b/examples/quick/threading/doc/images/qml-threading-example.png
diff --git a/doc/src/images/qml-touchinteraction-example.png b/examples/quick/touchinteraction/doc/images/qml-touchinteraction-example.png
index d4f0cab201..d4f0cab201 100644
--- a/doc/src/images/qml-touchinteraction-example.png
+++ b/examples/quick/touchinteraction/doc/images/qml-touchinteraction-example.png
diff --git a/doc/src/examples/example-slideswitch.qdoc b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
index 2f8729af73..2f8729af73 100644
--- a/doc/src/examples/example-slideswitch.qdoc
+++ b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf
index 8d6a6129e2..ae4965cbc0 100644
--- a/src/qml/doc/qtqml.qdocconf
+++ b/src/qml/doc/qtqml.qdocconf
@@ -1,4 +1,3 @@
-include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtQml
diff --git a/doc/src/images/declarative-adv-tutorial1.png b/src/quick/doc/images/declarative-adv-tutorial1.png
index 1699ab0e4d..1699ab0e4d 100644
--- a/doc/src/images/declarative-adv-tutorial1.png
+++ b/src/quick/doc/images/declarative-adv-tutorial1.png
diff --git a/doc/src/images/declarative-adv-tutorial2.png b/src/quick/doc/images/declarative-adv-tutorial2.png
index ba27c442ce..ba27c442ce 100644
--- a/doc/src/images/declarative-adv-tutorial2.png
+++ b/src/quick/doc/images/declarative-adv-tutorial2.png
diff --git a/doc/src/images/declarative-adv-tutorial3.png b/src/quick/doc/images/declarative-adv-tutorial3.png
index d500434d14..d500434d14 100644
--- a/doc/src/images/declarative-adv-tutorial3.png
+++ b/src/quick/doc/images/declarative-adv-tutorial3.png
diff --git a/doc/src/images/declarative-adv-tutorial4.gif b/src/quick/doc/images/declarative-adv-tutorial4.gif
index 827458daa5..827458daa5 100644
--- a/doc/src/images/declarative-adv-tutorial4.gif
+++ b/src/quick/doc/images/declarative-adv-tutorial4.gif
diff --git a/doc/src/images/declarative-samegame.png b/src/quick/doc/images/declarative-samegame.png
index 2232df2046..2232df2046 100644
--- a/doc/src/images/declarative-samegame.png
+++ b/src/quick/doc/images/declarative-samegame.png
diff --git a/doc/src/images/declarative-tutorial1.png b/src/quick/doc/images/declarative-tutorial1.png
index c9d3844cbd..c9d3844cbd 100644
--- a/doc/src/images/declarative-tutorial1.png
+++ b/src/quick/doc/images/declarative-tutorial1.png
diff --git a/doc/src/images/declarative-tutorial2.png b/src/quick/doc/images/declarative-tutorial2.png
index 835484aa4c..835484aa4c 100644
--- a/doc/src/images/declarative-tutorial2.png
+++ b/src/quick/doc/images/declarative-tutorial2.png
diff --git a/doc/src/images/declarative-tutorial3_animation.gif b/src/quick/doc/images/declarative-tutorial3_animation.gif
index 80b78dea9c..80b78dea9c 100644
--- a/doc/src/images/declarative-tutorial3_animation.gif
+++ b/src/quick/doc/images/declarative-tutorial3_animation.gif
diff --git a/src/quick/doc/images/qml-clocks-demo-small.png b/src/quick/doc/images/qml-clocks-demo-small.png
new file mode 100644
index 0000000000..04f77f0524
--- /dev/null
+++ b/src/quick/doc/images/qml-clocks-demo-small.png
diff --git a/src/quick/doc/images/qml-localstorage-example.png b/src/quick/doc/images/qml-localstorage-example.png
new file mode 100644
index 0000000000..e128574683
--- /dev/null
+++ b/src/quick/doc/images/qml-localstorage-example.png
diff --git a/src/quick/doc/images/qml-maroon-demo-small.png b/src/quick/doc/images/qml-maroon-demo-small.png
new file mode 100644
index 0000000000..502c85ad3b
--- /dev/null
+++ b/src/quick/doc/images/qml-maroon-demo-small.png
diff --git a/doc/src/images/qml-photoviewer-demo-small.png b/src/quick/doc/images/qml-photoviewer-demo-small.png
index b16fb4e53a..b16fb4e53a 100644
--- a/doc/src/images/qml-photoviewer-demo-small.png
+++ b/src/quick/doc/images/qml-photoviewer-demo-small.png
diff --git a/doc/src/images/qml-rssnews-demo-small.png b/src/quick/doc/images/qml-rssnews-demo-small.png
index 451a420623..451a420623 100644
--- a/doc/src/images/qml-rssnews-demo-small.png
+++ b/src/quick/doc/images/qml-rssnews-demo-small.png
diff --git a/doc/src/images/qml-samegame-demo-small.png b/src/quick/doc/images/qml-samegame-demo-small.png
index 174270b8f4..174270b8f4 100644
--- a/doc/src/images/qml-samegame-demo-small.png
+++ b/src/quick/doc/images/qml-samegame-demo-small.png
diff --git a/doc/src/images/qml-stocqt-demo-small.png b/src/quick/doc/images/qml-stocqt-demo-small.png
index 0f8a32f4f1..0f8a32f4f1 100644
--- a/doc/src/images/qml-stocqt-demo-small.png
+++ b/src/quick/doc/images/qml-stocqt-demo-small.png
diff --git a/src/quick/doc/images/qml-twitter-demo-small.png b/src/quick/doc/images/qml-twitter-demo-small.png
new file mode 100644
index 0000000000..e96d410559
--- /dev/null
+++ b/src/quick/doc/images/qml-twitter-demo-small.png
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 45d695bb24..42b2ec19bf 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -1,4 +1,3 @@
-include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtQuick
@@ -60,4 +59,3 @@ sourcedirs += ../../imports
 #add plugins directory because of dependencies
 headerdirs += ../../plugins
 sourcedirs += ../../plugins
-
diff --git a/doc/src/examples/advtutorial.qdoc b/src/quick/doc/src/advtutorial.qdoc
index 33d8e611fe..f5b3e8b7db 100644
--- a/doc/src/examples/advtutorial.qdoc
+++ b/src/quick/doc/src/advtutorial.qdoc
@@ -53,13 +53,13 @@ control QML elements.
 Tutorial chapters:
 
 \list 1
-\li \l {examples/tutorials/samegame/samegame1}{Creating the Game Canvas and Blocks}
-\li \l {examples/tutorials/samegame/samegame2}{Populating the Game Canvas}
-\li \l {examples/tutorials/samegame/samegame3}{Implementing the Game Logic}
-\li \l {examples/tutorials/samegame/samegame4}{Finishing Touches}
+\li \l {tutorials/samegame/samegame1}{Creating the Game Canvas and Blocks}
+\li \l {tutorials/samegame/samegame2}{Populating the Game Canvas}
+\li \l {tutorials/samegame/samegame3}{Implementing the Game Logic}
+\li \l {tutorials/samegame/samegame4}{Finishing Touches}
 \endlist
 
-All the code in this tutorial can be found in Qt's \c examples/examples/tutorials/samegame
+All the code in this tutorial can be found in Qt's \c examples/tutorials/samegame
 directory.
 */
 
@@ -71,7 +71,7 @@ directory.
 \previouspage QML Advanced Tutorial
 \nextpage QML Advanced Tutorial 2 - Populating the Game Canvas
 
-\example examples/tutorials/samegame/samegame1
+\example tutorials/samegame/samegame1
 
 \section2 Creating the application screen
 
@@ -83,7 +83,7 @@ To begin with, we create our Same Game application with a main screen like this:
 
 This is defined by the main application file, \c samegame.qml, which looks like this:
 
-\snippet examples/tutorials/samegame/samegame1/samegame.qml 0
+\snippet tutorials/samegame/samegame1/samegame.qml 0
 
 This gives you a basic game window that includes the main canvas for the
 blocks, a "New Game" button and a score display.
@@ -101,7 +101,7 @@ The \c Button item in the code above is defined in a separate component file nam
 To create a functional button, we use the QML elements \l Text and \l MouseArea inside a \l Rectangle.
 Here is the \c Button.qml code:
 
-\snippet examples/tutorials/samegame/samegame1/Button.qml 0
+\snippet tutorials/samegame/samegame1/Button.qml 0
 
 This essentially defines a rectangle that contains text and can be clicked. The \l MouseArea
 has an \c onClicked() handler that is implemented to emit the \c clicked() signal of the
@@ -111,7 +111,7 @@ In Same Game, the screen is filled with small blocks when the game begins.
 Each block is just an item that contains an image. The block
 code is defined in a separate \c Block.qml file:
 
-\snippet examples/tutorials/samegame/samegame1/Block.qml 0
+\snippet tutorials/samegame/samegame1/Block.qml 0
 
 At the moment, the block doesn't do anything; it is just an image. As the
 tutorial progresses we will animate and give behaviors to the blocks.
@@ -141,7 +141,7 @@ elements to get started. Next, we will populate the game canvas with some blocks
 \previouspage QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks
 \nextpage QML Advanced Tutorial 3 - Implementing the Game Logic
 
-\example examples/tutorials/samegame/samegame2
+\example tutorials/samegame/samegame2
 
 \section2 Generating the blocks in JavaScript
 
@@ -156,7 +156,7 @@ create the blocks in JavaScript.
 Here is the JavaScript code for generating the blocks, contained in a new
 file, \c samegame.js. The code is explained below.
 
-\snippet examples/tutorials/samegame/samegame2/samegame.js 0
+\snippet tutorials/samegame/samegame2/samegame.js 0
 
 The \c startNewGame() function deletes the blocks created in the previous game and
 calculates the number of rows and columns of blocks required to fill the game window for the new game.
@@ -192,14 +192,14 @@ Now we need to call the JavaScript code in \c samegame.js from our QML files.
 To do this, we add this line to \c samegame.qml which imports
 the JavaScript file as a \l{QML Modules}{module}:
 
-\snippet examples/tutorials/samegame/samegame2/samegame.qml 2
+\snippet tutorials/samegame/samegame2/samegame.qml 2
 
 This allows us to refer to any functions within \c samegame.js using "SameGame"
 as a prefix: for example, \c SameGame.startNewGame() or \c SameGame.createBlock().
 This means we can now connect the New Game button's \c onClicked handler to the \c startNewGame()
 function, like this:
 
-\snippet examples/tutorials/samegame/samegame2/samegame.qml 1
+\snippet tutorials/samegame/samegame2/samegame.qml 1
 
 So, when you click the New Game button, \c startNewGame() is called and generates a field of blocks, like this:
 
@@ -217,7 +217,7 @@ Now, we have a screen of blocks, and we can begin to add the game mechanics.
 \previouspage QML Advanced Tutorial 2 - Populating the Game Canvas
 \nextpage QML Advanced Tutorial 4 - Finishing Touches
 
-\example examples/tutorials/samegame/samegame3
+\example tutorials/samegame/samegame3
 
 \section2 Making a playable game
 
@@ -241,7 +241,7 @@ As this is a tutorial about QML, not game design, we will only discuss \c handle
 
 To make it easier for the JavaScript code to interface with the QML elements, we have added an Item called \c gameCanvas to \c samegame.qml. It replaces the background as the item which contains the blocks. It also accepts mouse input from the user.  Here is the item code:
 
-\snippet examples/tutorials/samegame/samegame3/samegame.qml 1
+\snippet tutorials/samegame/samegame3/samegame.qml 1
 
 The \c gameCanvas item is the exact size of the board, and has a \c score property and a \l MouseArea to handle mouse clicks.
 The blocks are now created as its children, and its dimensions are used to determine the board size so that
@@ -251,7 +251,7 @@ Note that it can still be accessed from the script.
 
 When clicked, the \l MouseArea calls \c{handleClick()} in \c samegame.js, which determines whether the player's click should cause any blocks to be removed, and updates \c gameCanvas.score with the current score if necessary. Here is the \c handleClick() function:
 
-\snippet examples/tutorials/samegame/samegame3/samegame.js 1
+\snippet tutorials/samegame/samegame3/samegame.js 1
 
 Note that if \c score was a global variable in the \c{samegame.js} file you would not be able to bind to it. You can only bind to QML properties.
 
@@ -259,17 +259,17 @@ Note that if \c score was a global variable in the \c{samegame.js} file you woul
 
 When the player clicks a block and triggers \c handleClick(), \c handleClick() also calls \c victoryCheck() to update the score and to check whether the player has completed the game. Here is the \c victoryCheck() code:
 
-\snippet examples/tutorials/samegame/samegame3/samegame.js 2
+\snippet tutorials/samegame/samegame3/samegame.js 2
 
 This updates the \c gameCanvas.score value and displays a "Game Over" dialog if the game is finished.
 
 The Game Over dialog is created using a \c Dialog element that is defined in \c Dialog.qml. Here is the \c Dialog.qml code. Notice how it is designed to be usable imperatively from the script file, via the functions and signals:
 
-\snippet examples/tutorials/samegame/samegame3/Dialog.qml 0
+\snippet tutorials/samegame/samegame3/Dialog.qml 0
 
 And this is how it is used in the main \c samegame.qml file:
 
-\snippet examples/tutorials/samegame/samegame3/samegame.qml 2
+\snippet tutorials/samegame/samegame3/samegame.qml 2
 
 We give the dialog a \l {Item::z}{z} value of 100 to ensure it is displayed on top of our other components. The default \c z value for an item is 0.
 
@@ -278,7 +278,7 @@ We give the dialog a \l {Item::z}{z} value of 100 to ensure it is displayed on t
 
 It's not much fun to play Same Game if all the blocks are the same color, so we've modified the \c createBlock() function in \c samegame.js to randomly create a different type of block (for either red, green or blue) each time it is called. \c Block.qml has also changed so that each block contains a different image depending on its type:
 
-\snippet examples/tutorials/samegame/samegame3/Block.qml 0
+\snippet tutorials/samegame/samegame3/Block.qml 0
 
 
 \section2 A working game
@@ -290,7 +290,7 @@ Here is a screenshot of what has been accomplished so far:
 
 This is what \c samegame.qml looks like now:
 
-\snippet examples/tutorials/samegame/samegame3/samegame.qml 0
+\snippet tutorials/samegame/samegame3/samegame.qml 0
 
 The game works, but it's a little boring right now. Where are the smooth animated transitions? Where are the high scores?
 If you were a QML expert you could have written these in the first iteration, but in this tutorial they've been saved
@@ -305,7 +305,7 @@ until the next chapter - where your application becomes alive!
 \contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial 3 - Implementing the Game Logic
 
-\example examples/tutorials/samegame/samegame4
+\example tutorials/samegame/samegame4
 
 \section2 Adding some flair
 
@@ -324,7 +324,7 @@ In \c BoomBlock.qml, we apply a \l SpringAnimation behavior to the \c x and \c y
 block will follow and animate its movement in a spring-like fashion towards the specified position (whose
 values will be set by \c samegame.js).Here is the code added to \c BoomBlock.qml:
 
-\snippet examples/tutorials/samegame/samegame4/content/BoomBlock.qml 1
+\snippet tutorials/samegame/samegame4/content/BoomBlock.qml 1
 
 The \c spring and \c damping values can be changed to modify the spring-like effect of the animation.
 
@@ -341,7 +341,7 @@ animate the opacity value so that it gradually fades in and out, instead of abru
 visible and invisible. To do this, we'll apply a \l Behavior on the \c opacity property of the \c Image
 element in \c BoomBlock.qml:
 
-\snippet examples/tutorials/samegame/samegame4/content/BoomBlock.qml 2
+\snippet tutorials/samegame/samegame4/content/BoomBlock.qml 2
 
 Note the \c{opacity: 0} which means the block is transparent when it is first created. We could set the opacity
 in \c samegame.js when we create and destroy the blocks,
@@ -367,14 +367,14 @@ To fade out, we set \c dying to true instead of setting opacity to 0 when a bloc
 Finally, we'll add a cool-looking particle effect to the blocks when they are destroyed. To do this, we first add a \l Particles element in
 \c BoomBlock.qml, like so:
 
-\snippet examples/tutorials/samegame/samegame4/content/BoomBlock.qml 3
+\snippet tutorials/samegame/samegame4/content/BoomBlock.qml 3
 
 To fully understand this you should read the \l Particles documentation, but it's important to note that \c emissionRate is set
 to zero so that particles are not emitted normally.
 Also, we extend the \c dying State, which creates a burst of particles by calling the \c burst() method on the particles element. The code for the states now look
 like this:
 
-\snippet examples/tutorials/samegame/samegame4/content/BoomBlock.qml 4
+\snippet tutorials/samegame/samegame4/content/BoomBlock.qml 4
 
 Now the game is beautifully animated, with subtle (or not-so-subtle) animations added for all of the
 player's actions. The end result is shown below, with a different set of images to demonstrate basic theming:
@@ -391,32 +391,32 @@ To do this, we will show a dialog when the game is over to request the player's
 This requires a few changes to \c Dialog.qml. In addition to a \c Text element, it now has a
 \c TextInput child item for receiving keyboard text input:
 
-\snippet examples/tutorials/samegame/samegame4/content/Dialog.qml 0
+\snippet tutorials/samegame/samegame4/content/Dialog.qml 0
 \dots 4
-\snippet examples/tutorials/samegame/samegame4/content/Dialog.qml 2
+\snippet tutorials/samegame/samegame4/content/Dialog.qml 2
 \dots 4
-\snippet examples/tutorials/samegame/samegame4/content/Dialog.qml 3
+\snippet tutorials/samegame/samegame4/content/Dialog.qml 3
 
 We'll also add a \c showWithInput() function. The text input will only be visible if this function
 is called instead of \c show(). When the dialog is closed, it emits a \c closed() signal, and
 other elements can retrieve the text entered by the user through an \c inputText property:
 
-\snippet examples/tutorials/samegame/samegame4/content/Dialog.qml 0
-\snippet examples/tutorials/samegame/samegame4/content/Dialog.qml 1
+\snippet tutorials/samegame/samegame4/content/Dialog.qml 0
+\snippet tutorials/samegame/samegame4/content/Dialog.qml 1
 \dots 4
-\snippet examples/tutorials/samegame/samegame4/content/Dialog.qml 3
+\snippet tutorials/samegame/samegame4/content/Dialog.qml 3
 
 Now the dialog can be used in \c samegame.qml:
 
-\snippet examples/tutorials/samegame/samegame4/samegame.qml 0
+\snippet tutorials/samegame/samegame4/samegame.qml 0
 
 When the dialog emits the \c closed signal, we call the new \c saveHighScore() function in \c samegame.js, which stores the high score locally in an SQL database and also send the score to an online database if possible.
 
 The \c nameInputDialog is activated in the \c victoryCheck() function in \c samegame.js:
 
-\snippet examples/tutorials/samegame/samegame4/content/samegame.js 3
+\snippet tutorials/samegame/samegame4/content/samegame.js 3
 \dots 4
-\snippet examples/tutorials/samegame/samegame4/content/samegame.js 4
+\snippet tutorials/samegame/samegame4/content/samegame.js 4
 
 \section3 Storing high scores offline
 
@@ -424,7 +424,7 @@ Now we need to implement the functionality to actually save the High Scores tabl
 
 Here is the \c saveHighScore() function in \c samegame.js:
 
-\snippet examples/tutorials/samegame/samegame4/content/samegame.js 2
+\snippet tutorials/samegame/samegame4/content/samegame.js 2
 
 First we call \c sendHighScore() (explained in the section below) if it is possible to send the high scores to an online database.
 
@@ -443,7 +443,7 @@ If the player entered their name we can send the data to the web service us
 
 If the player enters a name, we send the data to the service using this code in \c samegame.js:
 
-\snippet examples/tutorials/samegame/samegame4/content/samegame.js 1
+\snippet tutorials/samegame/samegame4/content/samegame.js 1
 
 The \l XMLHttpRequest in this code is the same as the \c XMLHttpRequest() as you'll find in standard browser JavaScript, and can be used in the same way to dynamically get XML
 or QML from the web service to display the high scores. We don't worry about the response in this case - we just post the high
diff --git a/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc b/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc
index 52a7591257..36abc0eaa8 100644
--- a/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc
+++ b/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc
@@ -87,6 +87,16 @@ their QML documentation. Qt Essentials modules exposing QML types include:
     \endlist
 \endlist
 
+\section1 Code Samples and Demos
+
+To learn more about uses of QML code, there are several code samples which show
+how QML types are used. In addition, there are several demos which show how
+QML code is used in applications.
+
+\list
+\li \l{Qt Quick Code Samples}
+\li \l{QML Demos}
+\endlist
 \section1 Features And Use-Case Solutions
 
 \list
@@ -150,4 +160,3 @@ provided by Qt Quick, please see the \l{Qt Quick} module documentation.
 \endlist
 
 */
-
diff --git a/src/quick/doc/src/appdevguide/qmldemos.qdoc b/src/quick/doc/src/appdevguide/qmldemos.qdoc
new file mode 100644
index 0000000000..2413d1a397
--- /dev/null
+++ b/src/quick/doc/src/appdevguide/qmldemos.qdoc
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+
+\page qtquick-demos.html
+\title QML Demos
+\brief QML demo applications showcasing the power of QML.
+\ingroup all-examples
+\ingroup qtquick
+\inqmlmodule QtQuick 2
+
+The following demo applications showcase the latest version of Qt Quick.
+\div {class="threecolumn_area"}
+    \div {class="heading"}
+    Qt Quick Applications
+    \enddiv
+    \div {class="threecolumn_piece"}
+        \l{demos/calqlatr}{Calculator}
+        \image qml-calqlatr-example-small.png
+    \enddiv
+    \div {class="threecolumn_piece"}
+        \l{demos/photoviewer}{Photo Viewer}
+        \image qml-photoviewer-demo-small.png
+    \enddiv
+    \div {class="threecolumn_piece"}
+        \l{demos/rssnews}{RSS News Reader}
+        \image qml-rssnews-demo-small.png
+    \enddiv
+    \div {class="threecolumn_piece"}
+        \l{demos/samegame}{Same Game}
+        \image qml-samegame-demo-small.png
+    \enddiv
+    \div {class="threecolumn_piece"}
+        \l{demos/tweetsearch}{Twitter}
+        \image qml-twitter-demo-small.png
+    \enddiv
+    \div {class="threecolumn_piece"}
+        \l{demos/stocqt}{Stock Quote}
+        \image qml-stocqt-demo-small.png
+    \enddiv
+    \div {class="threecolumn_piece"}
+        \l{demos/maroon}{Maroon Game}
+        \image qml-maroon-demo-small.png
+    \enddiv
+    \div {class="threecolumn_piece"}
+        \l{demos/clocks}{Clocks}
+        \image qml-clocks-demo-small.png
+    \enddiv
+\enddiv
+*/
diff --git a/doc/src/examples/dynamicview-tutorial.qdoc b/src/quick/doc/src/dynamicview-tutorial.qdoc
index bc6bee2c22..0b5f2b4f60 100644
--- a/doc/src/examples/dynamicview-tutorial.qdoc
+++ b/src/quick/doc/src/dynamicview-tutorial.qdoc
@@ -39,13 +39,13 @@ data to dynamically sort all items in a view.
 Tutorial chapters:
 
 \list 1
-\li \l {examples/tutorials/dynamicview/dynamicview1}{A Simple ListView and Delegate}
-\li \l {examples/tutorials/dynamicview/dynamicview2}{Dragging View Items}
-\li \l {examples/tutorials/dynamicview/dynamicview3}{Moving Dragged Items}
-\li \l {examples/tutorials/dynamicview/dynamicview4}{Sorting Items}
+\li \l {tutorials/dynamicview/dynamicview1}{A Simple ListView and Delegate}
+\li \l {tutorials/dynamicview/dynamicview2}{Dragging View Items}
+\li \l {tutorials/dynamicview/dynamicview3}{Moving Dragged Items}
+\li \l {tutorials/dynamicview/dynamicview4}{Sorting Items}
 \endlist
 
-All the code in this tutorial can be found in Qt's \c examples/examples/tutorials/dynamicview
+All the code in this tutorial can be found in Qt's \c examples/tutorials/dynamicview
 directory.
 */
 
@@ -57,19 +57,19 @@ directory.
 \previouspage QML Dynamic View Ordering Tutorial
 \nextpage QML Dynamic View Ordering Tutorial 2 - Dragging View Items
 
-\example examples/tutorials/dynamicview/dynamicview1
+\example tutorials/dynamicview/dynamicview1
 
 We begin our application by defining a ListView, a model which will provide data to the view, and a
 delegate which provides a template for constructing items in the view.
 
 The code for the ListView and delegate looks like this:
 
-\snippet examples/tutorials/dynamicview/dynamicview1/dynamicview.qml 0
+\snippet tutorials/dynamicview/dynamicview1/dynamicview.qml 0
 
 The model is defined in a separate QML file which looks like this:
 
-\snippet examples/tutorials/dynamicview/dynamicview1/PetsModel.qml 0
-\snippet examples/tutorials/dynamicview/dynamicview1/PetsModel.qml 1
+\snippet tutorials/dynamicview/dynamicview1/PetsModel.qml 0
+\snippet tutorials/dynamicview/dynamicview1/PetsModel.qml 1
 
 \section2 Walkthrough
 
@@ -79,11 +79,11 @@ is the template from which each item in the ListView is constructed.
 The \c name, \c age, \c type, and \c size variables referenced in the delegate are sourced from
 the model data.  The names correspond to roles defined in the model.
 
-\snippet examples/tutorials/dynamicview/dynamicview1/dynamicview.qml 1
+\snippet tutorials/dynamicview/dynamicview1/dynamicview.qml 1
 
 The second part of the application is the ListView itself to which we bind the model and delegate.
 
-\snippet examples/tutorials/dynamicview/dynamicview1/dynamicview.qml 2
+\snippet tutorials/dynamicview/dynamicview1/dynamicview.qml 2
 */
 
 /*!
@@ -94,13 +94,13 @@ The second part of the application is the ListView itself to which we bind the m
 \previouspage QML Dynamic View Ordering Tutorial 1 - A Simple ListView and Delegate
 \nextpage QML Dynamic View Ordering Tutorial 3 - Moving Dragged Items
 
-\example examples/tutorials/dynamicview/dynamicview2
+\example tutorials/dynamicview/dynamicview2
 
 Now that we have a visible list of items we want to be able to interact with them. We'll start
 by extending the delegate so the visible content can be dragged up and down the screen.  The
 updated delegate looks like this:
 
-\snippet examples/tutorials/dynamicview/dynamicview2/dynamicview.qml 0
+\snippet tutorials/dynamicview/dynamicview2/dynamicview.qml 0
 
 \section2 Walkthrough
 
@@ -109,8 +109,8 @@ for mouse events and will allow us to drag the delegate's content item.  It also
 a container for the content item which is important as a delegate's root item is positioned by
 the view and cannot be moved by other means.
 
-\snippet examples/tutorials/dynamicview/dynamicview2/dynamicview.qml 1
-\snippet examples/tutorials/dynamicview/dynamicview2/dynamicview.qml 2
+\snippet tutorials/dynamicview/dynamicview2/dynamicview.qml 1
+\snippet tutorials/dynamicview/dynamicview2/dynamicview.qml 2
 
 Dragging the content item is enabled by binding it to the MouseArea's
 \l {QtQuick2::MouseArea::drag.target}{drag.target} property.  Because we still want the view to be
@@ -120,14 +120,14 @@ timeout has expired it is interpreted as moving the list and if it moves after i
 dragging an item.  To make it more obvious to the user when an item can be dragged we'll change the
 background color of the content item when the timeout has expired.
 
-\snippet examples/tutorials/dynamicview/dynamicview2/dynamicview.qml 3
+\snippet tutorials/dynamicview/dynamicview2/dynamicview.qml 3
 
 The other thing we'll need to do before an item can be dragged is to unset any anchors on the
 content item so it can be freely moved around.  We do this in a state change that is triggered
 when the delegate item is held, at the same time we can reparent the content item to the root item
 so that is above other items in the stacking order and isn't obscured as it is dragged around.
 
-\snippet examples/tutorials/dynamicview/dynamicview2/dynamicview.qml 4
+\snippet tutorials/dynamicview/dynamicview2/dynamicview.qml 4
 
 */
 
@@ -145,10 +145,10 @@ The next step in our application to move items within the list as they're dragge
 can re-order the list.  To achieve this we introduce three new elements to our application;
 VisualDataModel, \l Drag and DropArea.
 
-\snippet examples/tutorials/dynamicview/dynamicview3/dynamicview.qml 0
-\snippet examples/tutorials/dynamicview/dynamicview3/dynamicview.qml 1
-\snippet examples/tutorials/dynamicview/dynamicview3/dynamicview.qml 2
-\snippet examples/tutorials/dynamicview/dynamicview3/dynamicview.qml 5
+\snippet tutorials/dynamicview/dynamicview3/dynamicview.qml 0
+\snippet tutorials/dynamicview/dynamicview3/dynamicview.qml 1
+\snippet tutorials/dynamicview/dynamicview3/dynamicview.qml 2
+\snippet tutorials/dynamicview/dynamicview3/dynamicview.qml 5
 
 \section2 Walkthrough
 
@@ -156,7 +156,7 @@ In order to re-order the view we need to determine when one item has been dragge
 the Drag attached property we can generate events that are sent to the scene graph whenever the item
 it is attached to moves.
 
-\snippet examples/tutorials/dynamicview/dynamicview3/dynamicview.qml 1
+\snippet tutorials/dynamicview/dynamicview3/dynamicview.qml 1
 
 Drag events are only sent while the active property is true, so in this example the first event
 would be sent when the delegate was held with additional event sents when dragging.  The
@@ -167,7 +167,7 @@ Then we use a DropArea in each view item to determine when the hot spot of the d
 intersects another item, when a drag enters one of these DropAreas we can move the dragged item
 to the index of the item it was dragged over.
 
-\snippet examples/tutorials/dynamicview/dynamicview3/dynamicview.qml 3
+\snippet tutorials/dynamicview/dynamicview3/dynamicview.qml 3
 
 To move the items within the view we use a VisualDataModel.  The VisualDataModel element is used by
 the view elements to instantiate delegate items from model data and when constructed explicitly can
@@ -181,7 +181,7 @@ To utilize a VisualDataModel with a ListView we bind it to the \l {QtQuick2::Lis
 property of the view and bind the \l {QtQuick2::VisualDataModel::model}{model} and
 \l {QtQuick2::VisualDataModel::delegate}{delegate} to the VisualDataModel.
 
-\snippet examples/tutorials/dynamicview/dynamicview3/dynamicview.qml 4
+\snippet tutorials/dynamicview/dynamicview3/dynamicview.qml 4
 
 */
 
@@ -192,13 +192,13 @@ property of the view and bind the \l {QtQuick2::VisualDataModel::model}{model} a
 \contentspage QML Dynamic View Ordering Tutorial
 \previouspage QML Dynamic View Ordering Tutorial 3 - Moving Dragged Items
 
-\example examples/tutorials/dynamicview/dynamicview4
+\example tutorials/dynamicview/dynamicview4
 
 Drag and drop isn't the only way items in a view can be re-ordered, using a VisualDataModel it is
 also possible to sort items based on model data.  To do that we extend our VisualDataModel instance
 like this:
 
-\snippet examples/tutorials/dynamicview/dynamicview4/dynamicview.qml 0
+\snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 0
 
 \section2 Walkthrough
 
@@ -209,8 +209,8 @@ we want items to first be added to an unsorted group from where we can transfer
 position in the items group.  To do that we clear includeByDefault on the items group and set it on
 a new group name 'unsorted'.
 
-\snippet examples/tutorials/dynamicview/dynamicview4/dynamicview.qml 1
-\snippet examples/tutorials/dynamicview/dynamicview4/dynamicview.qml 2
+\snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 1
+\snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 2
 
 We sort the items by first finding the position in the items group to insert the first unsorted
 item and then transfer the item to the items group before moving it to the pre-determined index and
@@ -221,19 +221,19 @@ with the \l {QtQuick2::VisualDataModel::get} {get} function.  Through the model
 handle we can access the same model data that is available in a delegate instance of that item and
 compare against other items to determine relative position.
 
-\snippet examples/tutorials/dynamicview/dynamicview4/dynamicview.qml 3
+\snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 3
 
 The lessThan argument to the sort function is a comparsion function which will determine the order
 of the list.  In this example it can be one of the following:
 
-\snippet examples/tutorials/dynamicview/dynamicview4/dynamicview.qml 4
+\snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 4
 
 A sort is triggered whenever new items are added to the unsorted VisualDataGroup which we are
 notified of by the \l {QtQuick2::VisualDataGroup::onChanged}{onChanged} handler.  If no sort
 function is currently selected we simply transfer all items from the unsorted group to the items
 group, otherwise we call sort with the selected sort function.
 
-\snippet examples/tutorials/dynamicview/dynamicview4/dynamicview.qml 5
+\snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 5
 
 Finally when the selected sort order changes we can trigger a full re-sort of the list by moving
 all items from the items group to the unsorted group, which will trigger the
@@ -241,6 +241,6 @@ all items from the items group to the unsorted group, which will trigger the
 items group in correct order.  Note that the \l {QtQuick2::VisualDataGroup::onChanged}{onChanged}
 handler will not be invoked recursively so there's no issue with it being invoked during a sort.
 
-\snippet examples/tutorials/dynamicview/dynamicview4/dynamicview.qml 6
+\snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 6
 
 */
diff --git a/doc/src/examples/examples.qdoc b/src/quick/doc/src/examples.qdoc
index 5e9949df98..b82911e6db 100644
--- a/doc/src/examples/examples.qdoc
+++ b/src/quick/doc/src/examples.qdoc
@@ -48,47 +48,6 @@ This set of code samples are part of the collection of \l{Qt Examples}.
 
 \div {class="threecolumn_area"}
     \div {class="heading"}
-    Qt Quick Applications
-    \enddiv
-    \div {class="threecolumn_piece"}
-        \l{demos/calculator}{Calculator}
-        \image qml-calculator-example-small.png
-    \enddiv
-    \div {class="threecolumn_piece"}
-        \l{demos/flickr}{Flickr Mobile}
-        \image qml-flickr-demo-small.png
-    \enddiv
-    \div {class="threecolumn_piece"}
-        \l{demos/minehunt}{Minehunt}
-        \image qml-minehunt-demo-small.png
-    \enddiv
-    \div {class="threecolumn_piece"}
-        \l{demos/photoviewer}{Photo Viewer}
-        \image qml-photoviewer-demo-small.png
-    \enddiv
-    \div {class="threecolumn_piece"}
-        \l{demos/rssnews}{RSS News Reader}
-        \image qml-rssnews-demo-small.png
-    \enddiv
-    \div {class="threecolumn_piece"}
-        \l{demos/samegame}{Same Game}
-        \image qml-samegame-demo-small.png
-    \enddiv
-    \div {class="threecolumn_piece"}
-        \l{demos/snake}{Snake}
-        \image qml-snake-demo-small.png
-    \enddiv
-    \div {class="threecolumn_piece"}
-        \l{demos/twitter}{Twitter}
-        \image qml-twitter-demo-small.png
-    \enddiv
-    \div {class="threecolumn_piece"}
-        \l{demos/webbrowser}{Web Browser}
-        \image qml-webbrowser-demo-small.png
-    \enddiv
-\enddiv
-\div {class="threecolumn_area"}
-    \div {class="heading"}
     QML Examples
     \enddiv
     Code samples demonstrate a general use for QML features. Some showcase
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc
index 1d24e33cc4..77f89f9868 100644
--- a/src/quick/doc/src/qtquick.qdoc
+++ b/src/quick/doc/src/qtquick.qdoc
@@ -126,6 +126,7 @@ Additional Qt Quick information:
     top-level windows and accessing screen information
     \endlist
 \li \l{Qt Quick Release Notes} - list of changes and additions in the Qt Quick
+\li \l{Qt Quick Code Samples} - list of all Qt Quick examples
 module
 \endlist
 
diff --git a/doc/src/examples/tutorial.qdoc b/src/quick/doc/src/tutorial.qdoc
index 94fdfae890..75c253c8c2 100644
--- a/doc/src/examples/tutorial.qdoc
+++ b/src/quick/doc/src/tutorial.qdoc
@@ -41,7 +41,7 @@ with properties and signals, and we will create a simple animation with the help
 
 Chapter one starts with a minimal "Hello world" program and the following chapters introduce new concepts.
 
-The tutorial's source code is located in the $QTDIR/examples/tutorials/helloworld directory.
+The tutorial's source code is located in the \c{examples/tutorials/helloworld} directory.
 
 Tutorial chapters:
 
@@ -68,7 +68,7 @@ The picture below is a screenshot of this program.
 
 Here is the QML code for the application:
 
-\snippet examples/tutorials/helloworld/tutorial1.qml 0
+\snippet tutorials/helloworld/tutorial1.qml 0
 
 \section1 Walkthrough
 
@@ -77,11 +77,11 @@ Here is the QML code for the application:
 First, we need to import the types that we need for this example. Most QML files will import the built-in QML
 types (like \l{Rectangle}, \l{Image}, ...) that come with Qt, using:
 
-\snippet examples/tutorials/helloworld/tutorial1.qml 3
+\snippet tutorials/helloworld/tutorial1.qml 3
 
 \section2 Rectangle element
 
-\snippet examples/tutorials/helloworld/tutorial1.qml 1
+\snippet tutorials/helloworld/tutorial1.qml 1
 
 We declare a root element of type \l{Rectangle}. It is one of the basic building blocks you can use to create an application in QML.
 We give it an \c{id} to be able to refer to it later. In this case, we call it "page".
@@ -90,7 +90,7 @@ The \l{Rectangle} element contains many other properties (such as \c x and \c y)
 
 \section2 Text element
 
-\snippet examples/tutorials/helloworld/tutorial1.qml 2
+\snippet tutorials/helloworld/tutorial1.qml 2
 
 We add a \l Text element as a child of the root Rectangle element that displays the text 'Hello world!'.
 
@@ -108,7 +108,7 @@ To view what you have created, run the \l{Prototyping with qmlscene}{qmlscene} t
 For example, to run the provided completed Tutorial 1 example from the install location, you would type:
 
 \code
-bin/qmlviewer $QTDIR/examples/tutorials/helloworld/tutorial1.qml
+qmlscene tutorials/helloworld/tutorial1.qml
 \endcode
 */
 
@@ -133,37 +133,37 @@ The component's filename must always start with a capital letter.
 
 Here is the QML code for \c Cell.qml:
 
-\snippet examples/tutorials/helloworld/Cell.qml 0
+\snippet tutorials/helloworld/Cell.qml 0
 
 \section1 Walkthrough
 
 \section2 The Cell Component
 
-\snippet examples/tutorials/helloworld/Cell.qml 1
+\snippet tutorials/helloworld/Cell.qml 1
 
 The root element of our component is an \l Item with the \c id \e container.
 An \l Item is the most basic visual element in QML and is often used as a container for other elements.
 
-\snippet examples/tutorials/helloworld/Cell.qml 4
+\snippet tutorials/helloworld/Cell.qml 4
 
 We declare a \c cellColor property. This property is accessible from  \e outside our component, this allows us
 to instantiate the cells with different colors.
 This property is just an alias to an existing property - the color of the rectangle that compose the cell
 (see \l{Property Binding in QML}).
 
-\snippet examples/tutorials/helloworld/Cell.qml 5
+\snippet tutorials/helloworld/Cell.qml 5
 
 We want our component to also have a signal that we call \e clicked with a \e cellColor parameter of type \e color.
 We will use this signal to change the color of the text in the main QML file later.
 
-\snippet examples/tutorials/helloworld/Cell.qml 2
+\snippet tutorials/helloworld/Cell.qml 2
 
 Our cell component is basically a colored rectangle with the \c id \e rectangle.
 
 The \c anchors.fill property is a convenient way to set the size of an element.
 In this case the rectangle will have the same size as its parent (see \l{anchor-layout}{Anchor-Based Layout}).
 
-\snippet examples/tutorials/helloworld/Cell.qml 3
+\snippet tutorials/helloworld/Cell.qml 3
 
 In order to change the color of the text when clicking on a cell, we create a \l MouseArea element with
 the same size as its parent.
@@ -175,11 +175,11 @@ When this signal is triggered we want to emit our own \e clicked signal with the
 
 In our main QML file, we use our \c Cell component to create the color picker:
 
-\snippet examples/tutorials/helloworld/tutorial2.qml 0
+\snippet tutorials/helloworld/tutorial2.qml 0
 
 We create the color picker by putting 6 cells with different colors in a grid.
 
-\snippet examples/tutorials/helloworld/tutorial2.qml 1
+\snippet tutorials/helloworld/tutorial2.qml 1
 
 When the \e clicked signal of our cell is triggered, we want to set the color of the text to the \e cellColor passed as a parameter.
 We can react to any signal of our component through a property of the name \e 'onSignalName' (see \l{Signal Attributes}).
@@ -228,5 +228,5 @@ This is equivalent to writing the two transitions separately.
 The \l ParallelAnimation element makes sure that the two types of animations (number and color) start at the same time.
 We could also run them one after the other by using \l SequentialAnimation instead.
 
-For more details on states and transitions, see \l {Qt Quick States} and the \l{declarative/animation/states}{states and transitions example}.
+For more details on states and transitions, see \l {Qt Quick States} and the \l{quick/animation/states}{states and transitions example}.
 */
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index f73de994ed..4ea31a0d6f 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -260,7 +260,7 @@ void QQuickWindowPrivate::polishItems()
  * being shown on screen. This feature is very limited in what it supports.
  *
  * For this feature to be useful one needs to hook into beforeRender()
- * and set the render tareget.
+ * and set the render target.
  *
  */
 void QQuickWindowPrivate::setRenderWithoutShowing(bool render)
@@ -2525,7 +2525,7 @@ uint QQuickWindow::renderTargetId() const
 }
 
 /*!
-    Returns the size of the currently set render target; otherwise returns an enpty size.
+    Returns the size of the currently set render target; otherwise returns an empty size.
  */
 QSize QQuickWindow::renderTargetSize() const
 {
@@ -2659,7 +2659,7 @@ QQmlIncubationController *QQuickWindow::incubationController() const
 
 
 /*!
-    Sets weither the scene graph rendering of QML should clear the color buffer
+    Sets whether the scene graph rendering of QML should clear the color buffer
     before it starts rendering to \a enabled.
 
     By disabling clearing of the color buffer, it is possible to do GL painting
@@ -2679,7 +2679,7 @@ void QQuickWindow::setClearBeforeRendering(bool enabled)
 
 
 /*!
-    Returns weither clearing of the color buffer is done before rendering or not.
+    Returns whether clearing of the color buffer is done before rendering or not.
  */
 
 bool QQuickWindow::clearBeforeRendering() const