diff options
author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:49:21 +0200 |
---|---|---|
committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:50:15 +0200 |
commit | 862f941bdc02f104e3aecc756a003f1c1f9f5112 (patch) | |
tree | 3ad5342cc2806d4dd51b88f26a9ff9e6eb30e63e /src/doc/src/snippets/declarative/qml-extending-types | |
parent | 758349e729134061bb29583846826c47badb0472 (diff) | |
parent | f7680b55f0d1d1ef102d40166f74cf4eee605e44 (diff) |
Merge branch 'stable' into release
Change-Id: Ib992a6e988e06887f7a4b3bc581514aa6a5b8886
Diffstat (limited to 'src/doc/src/snippets/declarative/qml-extending-types')
16 files changed, 16 insertions, 16 deletions
diff --git a/src/doc/src/snippets/declarative/qml-extending-types/components/Button.qml b/src/doc/src/snippets/declarative/qml-extending-types/components/Button.qml index 27e4546a..6da6a619 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/components/Button.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/components/Button.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/components/application.qml b/src/doc/src/snippets/declarative/qml-extending-types/components/application.qml index 5bf2d044..616f9d15 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/components/application.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/components/application.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/methods/app.qml b/src/doc/src/snippets/declarative/qml-extending-types/methods/app.qml index e170c0ff..c19ffcd1 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/methods/app.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/methods/app.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/properties/ImageViewer.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/ImageViewer.qml index aeb0dc22..0387d19b 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/properties/ImageViewer.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/ImageViewer.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/properties/alias-override.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias-override.qml index b85c72ba..17202a17 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/properties/alias-override.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias-override.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/properties/alias.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias.qml index 8bcc2f51..b3ee8901 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/properties/alias.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/properties/alias/ImageViewer.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias/ImageViewer.qml index 1f8c2817..0d26d3c4 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/properties/alias/ImageViewer.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias/ImageViewer.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml index 64edf85f..f0afe54a 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/properties/application.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/application.qml index eb8836d5..8799d54b 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/properties/application.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/application.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/properties/property-signals.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/property-signals.qml index b9e791ac..1b4c778a 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/properties/property-signals.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/property-signals.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/signals/Button.qml b/src/doc/src/snippets/declarative/qml-extending-types/signals/Button.qml index 6611e2b2..075557ac 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/signals/Button.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/signals/Button.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/signals/basic.qml b/src/doc/src/snippets/declarative/qml-extending-types/signals/basic.qml index d4594f44..951a3229 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/signals/basic.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/signals/basic.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/signals/connectdynamic.qml b/src/doc/src/snippets/declarative/qml-extending-types/signals/connectdynamic.qml index 81c00ebc..bdb709cf 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/signals/connectdynamic.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/signals/connectdynamic.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/signals/connectslots.qml b/src/doc/src/snippets/declarative/qml-extending-types/signals/connectslots.qml index c58cbcd6..dc534094 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/signals/connectslots.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/signals/connectslots.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/signals/no-parameters.qml b/src/doc/src/snippets/declarative/qml-extending-types/signals/no-parameters.qml index 1bd16cad..0affcaf3 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/signals/no-parameters.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/signals/no-parameters.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. diff --git a/src/doc/src/snippets/declarative/qml-extending-types/signals/parameters.qml b/src/doc/src/snippets/declarative/qml-extending-types/signals/parameters.qml index 88d15800..57a744d3 100644 --- a/src/doc/src/snippets/declarative/qml-extending-types/signals/parameters.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/signals/parameters.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. |