diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
| commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
| tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /doc/src/snippets/qtquick1/codingconventions | |
| parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
| parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) | |
Merge branch 'master' into animation-refactorwip/animation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'doc/src/snippets/qtquick1/codingconventions')
6 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/snippets/qtquick1/codingconventions/dotproperties.qml b/doc/src/snippets/qtquick1/codingconventions/dotproperties.qml index e7d5c55afc..810ff7501c 100644 --- a/doc/src/snippets/qtquick1/codingconventions/dotproperties.qml +++ b/doc/src/snippets/qtquick1/codingconventions/dotproperties.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/codingconventions/javascript-imports.qml b/doc/src/snippets/qtquick1/codingconventions/javascript-imports.qml index ad945105e5..039d0e923c 100644 --- a/doc/src/snippets/qtquick1/codingconventions/javascript-imports.qml +++ b/doc/src/snippets/qtquick1/codingconventions/javascript-imports.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/codingconventions/javascript.qml b/doc/src/snippets/qtquick1/codingconventions/javascript.qml index d0f8e3faaa..ea9d08d8e3 100644 --- a/doc/src/snippets/qtquick1/codingconventions/javascript.qml +++ b/doc/src/snippets/qtquick1/codingconventions/javascript.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/codingconventions/lists.qml b/doc/src/snippets/qtquick1/codingconventions/lists.qml index 508d4c6cff..95014ddf6c 100644 --- a/doc/src/snippets/qtquick1/codingconventions/lists.qml +++ b/doc/src/snippets/qtquick1/codingconventions/lists.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/codingconventions/photo.qml b/doc/src/snippets/qtquick1/codingconventions/photo.qml index ae4fdc63e1..91b4de1922 100644 --- a/doc/src/snippets/qtquick1/codingconventions/photo.qml +++ b/doc/src/snippets/qtquick1/codingconventions/photo.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/codingconventions/private.qml b/doc/src/snippets/qtquick1/codingconventions/private.qml index 088bc3e3c6..f69b050b53 100644 --- a/doc/src/snippets/qtquick1/codingconventions/private.qml +++ b/doc/src/snippets/qtquick1/codingconventions/private.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** |