diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
| commit | 9c54d0ef8f6442e32d5762edccef46db80b68681 (patch) | |
| tree | 0fdbc2be98a2e7fd7728a3860d56c94db3e173bb /examples/quick/tutorials/gettingStartedQml/parts/part3 | |
| parent | 1512835ee1425a3e874d2f2dd2b01f1a1ea7b763 (diff) | |
| parent | 36a42ed6b11dce102d0e0f93fbd441011b003157 (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf
Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
Diffstat (limited to 'examples/quick/tutorials/gettingStartedQml/parts/part3')
6 files changed, 6 insertions, 6 deletions
diff --git a/examples/quick/tutorials/gettingStartedQml/parts/part3/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/Button.qml index 7119feeb08..b17bc38960 100644 --- a/examples/quick/tutorials/gettingStartedQml/parts/part3/Button.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/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 QtQml module of the Qt Toolkit. diff --git a/examples/quick/tutorials/gettingStartedQml/parts/part3/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/EditMenu.qml index 47a37059b0..83877a7392 100644 --- a/examples/quick/tutorials/gettingStartedQml/parts/part3/EditMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/EditMenu.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 QtQml module of the Qt Toolkit. diff --git a/examples/quick/tutorials/gettingStartedQml/parts/part3/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/FileMenu.qml index 41c7369fc0..e96abda829 100644 --- a/examples/quick/tutorials/gettingStartedQml/parts/part3/FileMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/FileMenu.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 QtQml module of the Qt Toolkit. diff --git a/examples/quick/tutorials/gettingStartedQml/parts/part3/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/MenuBar.qml index f9a293361e..929052f0ae 100644 --- a/examples/quick/tutorials/gettingStartedQml/parts/part3/MenuBar.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/MenuBar.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 QtQml module of the Qt Toolkit. diff --git a/examples/quick/tutorials/gettingStartedQml/parts/part3/TextArea.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextArea.qml index fa79c71fd9..6f860597e6 100644 --- a/examples/quick/tutorials/gettingStartedQml/parts/part3/TextArea.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextArea.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 QtQml module of the Qt Toolkit. diff --git a/examples/quick/tutorials/gettingStartedQml/parts/part3/TextEditor.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextEditor.qml index 49be5e84cd..86695075ff 100644 --- a/examples/quick/tutorials/gettingStartedQml/parts/part3/TextEditor.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextEditor.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 QtQml module of the Qt Toolkit. |