Merge remote-tracking branch 'origin/5.3' into dev

Change-Id: Iba61035910c46627e5e1c3824757da7b3d573657

30 files changed, 349 insertions, 90 deletions

diff --git a/examples/quick/customitems/dialcontrol/dialcontrol.qmlproject b/examples/quick/customitems/dialcontrol/dialcontrol.qmlproject
new file mode 100644
index 0000000000..4056ad87ef
--- /dev/null
+++ b/examples/quick/customitems/dialcontrol/dialcontrol.qmlproject
@@ -0,0 +1,17 @@
+import QmlProject 1.1
+
+Project {
+    mainFile: "dialcontrol.qml"
+
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+}
+
diff --git a/examples/quick/customitems/dialcontrol/doc/images/qml-dialcontrol-example.png b/examples/quick/customitems/dialcontrol/doc/images/qml-dialcontrol-example.png
new file mode 100644
index 0000000000..74cd645d3a
--- /dev/null
+++ b/examples/quick/customitems/dialcontrol/doc/images/qml-dialcontrol-example.png
diff --git a/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc b/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc
new file mode 100644
index 0000000000..f0c5863526
--- /dev/null
+++ b/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+/*!
+    \title UI Components: Dial Control Example
+    \example customitems/dialcontrol
+
+    This example shows how to create a dial-type control. It combines
+    \l Image elements with \l Rotation transforms and \l SpringAnimation behaviors
+    to produce an interactive speedometer-type dial.
+
+    \image qml-dialcontrol-example.png
+*/
+
+
diff --git a/examples/quick/customitems/flipable/doc/images/qml-flipable-example.png b/examples/quick/customitems/flipable/doc/images/qml-flipable-example.png
new file mode 100644
index 0000000000..dd68a66cef
--- /dev/null
+++ b/examples/quick/customitems/flipable/doc/images/qml-flipable-example.png
diff --git a/examples/quick/demos/calqlatr/content/StyleLabel.qml b/examples/quick/customitems/flipable/doc/src/flipable.qdoc
index ff4e10a932..7ee5fba73a 100644
--- a/examples/quick/demos/calqlatr/content/StyleLabel.qml
+++ b/examples/quick/customitems/flipable/doc/src/flipable.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -38,13 +38,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
+/*!
+    \title UI Components: Flipable Example
+    \example customitems/flipable
+
+    This example shows how to use the \l Flipable element.
+
+    \image qml-flipable-example.png
+*/
 
-Text {
-    width: 64
-    font.pixelSize: 14
-    font.bold: false
-    wrapMode: Text.WordWrap
-    lineHeight: 0.75
-    color: "#676764"
-}
diff --git a/examples/quick/customitems/flipable/flipable.qmlproject b/examples/quick/customitems/flipable/flipable.qmlproject
new file mode 100644
index 0000000000..68718b2e69
--- /dev/null
+++ b/examples/quick/customitems/flipable/flipable.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.1
+
+Project {
+    mainFile: "flipable.qml"
+
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+}
diff --git a/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png b/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png
new file mode 100644
index 0000000000..54adf33daa
--- /dev/null
+++ b/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png
diff --git a/examples/quick/customitems/scrollbar/doc/src/scrollbar.qdoc b/examples/quick/customitems/scrollbar/doc/src/scrollbar.qdoc
new file mode 100644
index 0000000000..7847692e73
--- /dev/null
+++ b/examples/quick/customitems/scrollbar/doc/src/scrollbar.qdoc
@@ -0,0 +1,37 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 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 UI Components: Scroll Bar Example
+    \example customitems/scrollbar
+
+    This example shows how to create scroll bars for a \l Flickable element
+    using the \l {Flickable::visibleArea.xPosition}{Flickable::visibleArea}
+    properties.
+
+    \image qml-scrollbar-example.png
+*/
+
diff --git a/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png b/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png
new file mode 100644
index 0000000000..847052d301
--- /dev/null
+++ b/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png
diff --git a/examples/quick/customitems/tabwidget/tab.png b/examples/quick/customitems/tabwidget/doc/images/tab.png
index ad8021605f..ad8021605f 100644
--- a/examples/quick/customitems/tabwidget/tab.png
+++ b/examples/quick/customitems/tabwidget/doc/images/tab.png
diff --git a/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc b/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc
new file mode 100644
index 0000000000..9aefd96e92
--- /dev/null
+++ b/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 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 TabWidget Example
+    \example customitems/tabwidget
+
+    This example shows how to create a tab widget. It also demonstrates how
+    \l {Property aliases}{property aliases} and
+    \l {QML Object Attributes#Default Properties}{default properties} can be used to collect and
+    assemble the child items declared within an \l Item.
+
+    \image qml-tabwidget-example.png
+*/
+
+
diff --git a/examples/quick/demos/calqlatr/calqlatr.pro b/examples/quick/demos/calqlatr/calqlatr.pro
index 91d52a293e..20543c08da 100644
--- a/examples/quick/demos/calqlatr/calqlatr.pro
+++ b/examples/quick/demos/calqlatr/calqlatr.pro
@@ -10,20 +10,10 @@ OTHER_FILES = calqlatr.qml \
     content/Button.qml \
     content/Display.qml \
     content/NumberPad.qml \
-    content/StyleLabel.qml \
-    content/audio/touch.wav \
     content/calculator.js \
-    content/images/icon-back.png \
-    content/images/icon-close.png \
-    content/images/icon-settings.png \
-    content/images/logo.png \
     content/images/paper-edge-left.png \
     content/images/paper-edge-right.png \
-    content/images/paper-grip.png \
-    content/images/settings-selected-a.png \
-    content/images/settings-selected-b.png \
-    content/images/touch-green.png \
-    content/images/touch-white.png
+    content/images/paper-grip.png
 
 target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/calqlatr
 INSTALLS += target
diff --git a/examples/quick/demos/calqlatr/calqlatr.qrc b/examples/quick/demos/calqlatr/calqlatr.qrc
index fda7d35d7e..7483304e02 100644
--- a/examples/quick/demos/calqlatr/calqlatr.qrc
+++ b/examples/quick/demos/calqlatr/calqlatr.qrc
@@ -5,18 +5,8 @@
         <file>content/calculator.js</file>
         <file>content/Display.qml</file>
         <file>content/NumberPad.qml</file>
-        <file>content/StyleLabel.qml</file>
-        <file>content/audio/touch.wav</file>
-        <file>content/images/icon-back.png</file>
-        <file>content/images/icon-close.png</file>
-        <file>content/images/icon-settings.png</file>
-        <file>content/images/logo.png</file>
         <file>content/images/paper-edge-left.png</file>
         <file>content/images/paper-edge-right.png</file>
         <file>content/images/paper-grip.png</file>
-        <file>content/images/settings-selected-a.png</file>
-        <file>content/images/settings-selected-b.png</file>
-        <file>content/images/touch-green.png</file>
-        <file>content/images/touch-white.png</file>
     </qresource>
 </RCC>
diff --git a/examples/quick/demos/calqlatr/content/audio/touch.wav b/examples/quick/demos/calqlatr/content/audio/touch.wav
deleted file mode 100644
index 94cccb7546..0000000000
--- a/examples/quick/demos/calqlatr/content/audio/touch.wav
+++ /dev/null
diff --git a/examples/quick/demos/calqlatr/content/images/icon-back.png b/examples/quick/demos/calqlatr/content/images/icon-back.png
deleted file mode 100644
index 2989ee2e35..0000000000
--- a/examples/quick/demos/calqlatr/content/images/icon-back.png
+++ /dev/null
diff --git a/examples/quick/demos/calqlatr/content/images/icon-close.png b/examples/quick/demos/calqlatr/content/images/icon-close.png
deleted file mode 100644
index 3e21248232..0000000000
--- a/examples/quick/demos/calqlatr/content/images/icon-close.png
+++ /dev/null
diff --git a/examples/quick/demos/calqlatr/content/images/icon-settings.png b/examples/quick/demos/calqlatr/content/images/icon-settings.png
deleted file mode 100644
index 98e662f53f..0000000000
--- a/examples/quick/demos/calqlatr/content/images/icon-settings.png
+++ /dev/null
diff --git a/examples/quick/demos/calqlatr/content/images/logo.png b/examples/quick/demos/calqlatr/content/images/logo.png
deleted file mode 100644
index 6bc65610bc..0000000000
--- a/examples/quick/demos/calqlatr/content/images/logo.png
+++ /dev/null
diff --git a/examples/quick/demos/calqlatr/content/images/settings-selected-a.png b/examples/quick/demos/calqlatr/content/images/settings-selected-a.png
deleted file mode 100644
index e08ddface8..0000000000
--- a/examples/quick/demos/calqlatr/content/images/settings-selected-a.png
+++ /dev/null
diff --git a/examples/quick/demos/calqlatr/content/images/settings-selected-b.png b/examples/quick/demos/calqlatr/content/images/settings-selected-b.png
deleted file mode 100644
index d9aa7e3431..0000000000
--- a/examples/quick/demos/calqlatr/content/images/settings-selected-b.png
+++ /dev/null
diff --git a/examples/quick/demos/calqlatr/content/images/touch-green.png b/examples/quick/demos/calqlatr/content/images/touch-green.png
deleted file mode 100644
index 64dbde66b1..0000000000
--- a/examples/quick/demos/calqlatr/content/images/touch-green.png
+++ /dev/null
diff --git a/examples/quick/demos/calqlatr/content/images/touch-white.png b/examples/quick/demos/calqlatr/content/images/touch-white.png
deleted file mode 100644
index bb02b000cf..0000000000
--- a/examples/quick/demos/calqlatr/content/images/touch-white.png
+++ /dev/null
diff --git a/examples/quick/demos/rssnews/content/CategoryDelegate.qml b/examples/quick/demos/rssnews/content/CategoryDelegate.qml
index cb48715609..93d688a29c 100644
--- a/examples/quick/demos/rssnews/content/CategoryDelegate.qml
+++ b/examples/quick/demos/rssnews/content/CategoryDelegate.qml
@@ -39,7 +39,6 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtGraphicalEffects 1.0
 
 Rectangle {
     id: delegate
@@ -54,56 +53,21 @@ Rectangle {
         source: image
     }
 
-    Item {
-        id: title
-        anchors.fill: parent
+    Text {
+        id: titleText
 
-        Text {
-            id: titleText
-
-            anchors {
-                left: parent.left; leftMargin: 20
-                right: parent.right; rightMargin: 20
-                top: parent.top; topMargin: 20
-            }
-            font { pixelSize: 18; bold: true }
-            text: name
-            color: selected ? "#ffffff" : "#ebebdd"
-            Behavior on color { ColorAnimation { duration: 150 } }
+        anchors {
+            left: parent.left; leftMargin: 20
+            right: parent.right; rightMargin: 20
+            top: parent.top; topMargin: 20
         }
 
-        DropShadow {
-            source: titleText
-            anchors.fill: titleText
-            horizontalOffset: selected ? 3 : 1
-            verticalOffset: selected ? 3 : 1
-            radius: 4
-            color: "#2f1000"
-            samples: 8
-
-            Behavior on horizontalOffset { NumberAnimation { duration: 300 } }
-            Behavior on verticalOffset   { NumberAnimation { duration: 300 } }
-        }
-
-        states: [
-            State {
-                name: "selected"
-                when: selected
-                PropertyChanges { target: title; scale: "1.1" }
-            }]
-
-        transitions: [
-            Transition {
-                to: "selected"
-                SequentialAnimation {
-                    id: titleAnimation
-                    PropertyAnimation { target: title; property: "scale"; duration: 300 }
-                }
-            },
-            Transition {
-                to: ""
-                animations: titleAnimation
-            }]
+        font { pixelSize: 18; bold: true }
+        text: name
+        color: selected ? "#ffffff" : "#ebebdd"
+        scale: selected ? 1.15 : 1.0
+        Behavior on color { ColorAnimation { duration: 150 } }
+        Behavior on scale { PropertyAnimation { duration: 300 } }
     }
 
     BusyIndicator {
diff --git a/examples/quick/demos/rssnews/content/NewsDelegate.qml b/examples/quick/demos/rssnews/content/NewsDelegate.qml
index fee1119b08..280e4d1631 100644
--- a/examples/quick/demos/rssnews/content/NewsDelegate.qml
+++ b/examples/quick/demos/rssnews/content/NewsDelegate.qml
@@ -39,11 +39,11 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Layouts 1.1
 
-ColumnLayout {
+Column {
     id: delegate
     width: delegate.ListView.view.width
+    spacing: 8
 
     // Returns a string representing how long ago an event occurred
     function timeSinceEvent(pubDate) {
@@ -77,13 +77,15 @@ ColumnLayout {
         return result;
     }
 
-    RowLayout {
-        Layout.maximumWidth: parent.width
+    Item { height: 8; width: delegate.width }
 
-        ColumnLayout {
-            Layout.alignment: Qt.AlignTop
+    Row {
+        width: parent.width
+        spacing: 8
 
+        Column {
             Item {
+                width: 4
                 height: titleText.font.pixelSize / 4
             }
 
@@ -97,7 +99,7 @@ ColumnLayout {
             id: titleText
 
             text: title
-            Layout.maximumWidth: delegate.width - titleImage.width
+            width: delegate.width - titleImage.width
             wrapMode: Text.WordWrap
             font.pixelSize: 26
             font.bold: true
@@ -105,11 +107,10 @@ ColumnLayout {
     }
 
     Text {
-        Layout.maximumWidth: delegate.width
+        width: delegate.width
         font.pixelSize: 12
         textFormat: Text.RichText
         font.italic: true
-        Layout.alignment: Qt.AlignLeft
         text: timeSinceEvent(pubDate) + " (<a href=\"" + link + "\">Link</a>)"
         onLinkActivated: {
             Qt.openUrlExternally(link)
@@ -120,7 +121,7 @@ ColumnLayout {
         id: descriptionText
 
         text: description
-        Layout.maximumWidth: parent.width
+        width: parent.width
         wrapMode: Text.WordWrap
         font.pixelSize: 14
         textFormat: Text.StyledText
diff --git a/examples/quick/imageprovider/doc/images/qml-imageprovider-example.png b/examples/quick/imageprovider/doc/images/qml-imageprovider-example.png
new file mode 100644
index 0000000000..e82548ae81
--- /dev/null
+++ b/examples/quick/imageprovider/doc/images/qml-imageprovider-example.png
diff --git a/examples/quick/imageprovider/doc/src/imageprovider.qdoc b/examples/quick/imageprovider/doc/src/imageprovider.qdoc
new file mode 100644
index 0000000000..d25eeae672
--- /dev/null
+++ b/examples/quick/imageprovider/doc/src/imageprovider.qdoc
@@ -0,0 +1,37 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 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 C++ Extensions: Image Provider Example
+    \example imageprovider
+
+    This examples shows how to use QQuickImageProvider to serve images
+    to QML image elements.
+
+    \image qml-imageprovider-example.png
+*/
+
diff --git a/examples/quick/threading/threadedlistmodel/doc/src/threadedlistmodel.qdoc b/examples/quick/threading/threadedlistmodel/doc/src/threadedlistmodel.qdoc
new file mode 100644
index 0000000000..de7b2a49a2
--- /dev/null
+++ b/examples/quick/threading/threadedlistmodel/doc/src/threadedlistmodel.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 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 Threaded ListModel Example
+    \example threading/threadedlistmodel
+
+    This example shows how to use a ListModel from multiple threads using
+    WorkerScript.
+*/
+
diff --git a/examples/quick/threading/workerscript/workerscript.js b/examples/quick/threading/workerscript/workerscript.js
index 67fbd8af9a..0a6a37ef29 100644
--- a/examples/quick/threading/workerscript/workerscript.js
+++ b/examples/quick/threading/workerscript/workerscript.js
@@ -1,3 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 //Will be initialized when WorkerScript{} is instantiated
 var cache = new Array(64);
 for (var i = 0; i < 64; i++)
diff --git a/examples/quick/threading/workerscript/workerscript.qmlproject b/examples/quick/threading/workerscript/workerscript.qmlproject
index 6d7a91feeb..05c5cf4756 100644
--- a/examples/quick/threading/workerscript/workerscript.qmlproject
+++ b/examples/quick/threading/workerscript/workerscript.qmlproject
@@ -1,3 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 import QmlProject 1.1
 
 Project {
diff --git a/examples/quick/views/doc/src/views.qdoc b/examples/quick/views/doc/src/views.qdoc
index d25d9f40c9..0e91bfe78c 100644
--- a/examples/quick/views/doc/src/views.qdoc
+++ b/examples/quick/views/doc/src/views.qdoc
@@ -68,7 +68,7 @@
 
     \section1 Highlight
 
-    \e Highlight demonstrates adding a custom highlight to a \l ListView.
+    \e Highlight demonstrates adding a custom highlight to a ListView.
     \snippet views/listview/highlight.qml 0
 
     \section1 Highlight Ranges