aboutsummaryrefslogtreecommitdiffstats
path: root/doc/tutorials
diff options
context:
space:
mode:
authorTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-20 15:26:59 +0300
committerSergio Ahumada <sergio.ahumada@digia.com>2013-05-23 11:16:40 +0200
commitfa2e571b6c68aa9439a88fc7ab441b6e091268df (patch)
tree21d8496604e459b51a55fcc3963801b44e9cf871 /doc/tutorials
parenta6785ad13fc096c60b2fc38d4220010ae708743a (diff)
Fixed licenses
License fixed using replace-licenses.zsh from mkdist repo. Possible copyright and contact changes will come later. Change-Id: I18b977ac33f1b00e99fa7aae6c1a824769ce5f6e Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'doc/tutorials')
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame1/Block.qml9
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame1/Button.qml9
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame1/samegame.qml9
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame2/Block.qml9
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame2/Button.qml9
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame.qml9
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame3/Block.qml9
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame3/Button.qml9
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame3/Dialog.qml9
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame.qml9
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/BoomBlock.qml9
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Button.qml9
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Dialog.qml9
-rw-r--r--doc/tutorials/qmladvancedtutorial/samegame/samegame4/samegame.qml9
-rw-r--r--doc/tutorials/qmltutorial/helloworld/Cell.qml9
-rw-r--r--doc/tutorials/qmltutorial/helloworld/tutorial1.qml9
-rw-r--r--doc/tutorials/qmltutorial/helloworld/tutorial2.qml9
-rw-r--r--doc/tutorials/qmltutorial/helloworld/tutorial3.qml9
18 files changed, 90 insertions, 72 deletions
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Block.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Block.qml
index b4c43993c..b00833ab4 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Block.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Block.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Button.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Button.qml
index a3df028c7..f62a1f76b 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Button.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/Button.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame1/samegame.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/samegame.qml
index 5cc13fd74..8d9c25b20 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame1/samegame.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame1/samegame.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame2/Block.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/Block.qml
index 804c30f99..a8c74dae4 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame2/Block.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/Block.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame2/Button.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/Button.qml
index cbf1b5444..c716685ac 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame2/Button.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/Button.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame.qml
index 11f622976..7906a2db1 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame2/samegame.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Block.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Block.qml
index 784a6f4b8..94196f72a 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Block.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Block.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Button.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Button.qml
index cbf1b5444..c716685ac 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Button.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Button.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Dialog.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Dialog.qml
index 8554d867c..1f06ac36a 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Dialog.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/Dialog.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame.qml
index 972b77898..f5db187a3 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame3/samegame.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/BoomBlock.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/BoomBlock.qml
index 326b1b84c..98e0b9107 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/BoomBlock.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/BoomBlock.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Button.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Button.qml
index cbf1b5444..c716685ac 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Button.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Button.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Dialog.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Dialog.qml
index c390202c6..d0773ef26 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Dialog.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/content/Dialog.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/samegame.qml b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/samegame.qml
index e8306350c..17bc4ba3b 100644
--- a/doc/tutorials/qmladvancedtutorial/samegame/samegame4/samegame.qml
+++ b/doc/tutorials/qmladvancedtutorial/samegame/samegame4/samegame.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmltutorial/helloworld/Cell.qml b/doc/tutorials/qmltutorial/helloworld/Cell.qml
index 76055abf3..b7ed6cc3f 100644
--- a/doc/tutorials/qmltutorial/helloworld/Cell.qml
+++ b/doc/tutorials/qmltutorial/helloworld/Cell.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmltutorial/helloworld/tutorial1.qml b/doc/tutorials/qmltutorial/helloworld/tutorial1.qml
index 83b57b8f6..162b87e77 100644
--- a/doc/tutorials/qmltutorial/helloworld/tutorial1.qml
+++ b/doc/tutorials/qmltutorial/helloworld/tutorial1.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmltutorial/helloworld/tutorial2.qml b/doc/tutorials/qmltutorial/helloworld/tutorial2.qml
index 1bfab92fe..f3f58bdb3 100644
--- a/doc/tutorials/qmltutorial/helloworld/tutorial2.qml
+++ b/doc/tutorials/qmltutorial/helloworld/tutorial2.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/
diff --git a/doc/tutorials/qmltutorial/helloworld/tutorial3.qml b/doc/tutorials/qmltutorial/helloworld/tutorial3.qml
index cc0686555..04f1da38e 100644
--- a/doc/tutorials/qmltutorial/helloworld/tutorial3.qml
+++ b/doc/tutorials/qmltutorial/helloworld/tutorial3.qml
@@ -18,10 +18,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation 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.
+** * 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
@@ -34,6 +34,7 @@
** 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$
**
****************************************************************************/