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 /examples/declarative/canvas/contents | |
| parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
| parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) | |
| download | qtdeclarative-animation-refactor.tar.gz | |
Merge branch 'master' into animation-refactorwip/animation-refactoranimation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'examples/declarative/canvas/contents')
6 files changed, 7 insertions, 7 deletions
diff --git a/examples/declarative/canvas/contents/Button.qml b/examples/declarative/canvas/contents/Button.qml index 9560f1e55f..c7c23c10a6 100644 --- a/examples/declarative/canvas/contents/Button.qml +++ b/examples/declarative/canvas/contents/Button.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 examples of the Qt Toolkit. ** diff --git a/examples/declarative/canvas/contents/ScrollBar.qml b/examples/declarative/canvas/contents/ScrollBar.qml index ad01b03a91..384f4159d1 100644 --- a/examples/declarative/canvas/contents/ScrollBar.qml +++ b/examples/declarative/canvas/contents/ScrollBar.qml @@ -1,8 +1,8 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** 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 Qt Mobility Components. ** diff --git a/examples/declarative/canvas/contents/Slider.qml b/examples/declarative/canvas/contents/Slider.qml index fffc2788c4..a75ecd1485 100644 --- a/examples/declarative/canvas/contents/Slider.qml +++ b/examples/declarative/canvas/contents/Slider.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 Declarative module of the Qt Toolkit. ** diff --git a/examples/declarative/canvas/contents/Stocks.qml b/examples/declarative/canvas/contents/Stocks.qml index 07734badf6..0550720731 100644 --- a/examples/declarative/canvas/contents/Stocks.qml +++ b/examples/declarative/canvas/contents/Stocks.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 examples of the Qt Toolkit. ** diff --git a/examples/declarative/canvas/contents/TitleBar.qml b/examples/declarative/canvas/contents/TitleBar.qml index 7a00162ae2..a696fc8517 100644 --- a/examples/declarative/canvas/contents/TitleBar.qml +++ b/examples/declarative/canvas/contents/TitleBar.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 examples of the Qt Toolkit. ** diff --git a/examples/declarative/canvas/contents/ToolBar.qml b/examples/declarative/canvas/contents/ToolBar.qml index d82815fa2f..8ee3a85403 100644 --- a/examples/declarative/canvas/contents/ToolBar.qml +++ b/examples/declarative/canvas/contents/ToolBar.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 examples of the Qt Toolkit. ** |