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/qtquick1/animation | |
| 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/qtquick1/animation')
9 files changed, 9 insertions, 9 deletions
diff --git a/examples/declarative/qtquick1/animation/basics/color-animation.qml b/examples/declarative/qtquick1/animation/basics/color-animation.qml index afeca1fad2..caf9940f8e 100644 --- a/examples/declarative/qtquick1/animation/basics/color-animation.qml +++ b/examples/declarative/qtquick1/animation/basics/color-animation.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/qtquick1/animation/basics/property-animation.qml b/examples/declarative/qtquick1/animation/basics/property-animation.qml index 4948735647..64edc83492 100644 --- a/examples/declarative/qtquick1/animation/basics/property-animation.qml +++ b/examples/declarative/qtquick1/animation/basics/property-animation.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/qtquick1/animation/behaviors/SideRect.qml b/examples/declarative/qtquick1/animation/behaviors/SideRect.qml index fd84ff6516..3c90d80155 100644 --- a/examples/declarative/qtquick1/animation/behaviors/SideRect.qml +++ b/examples/declarative/qtquick1/animation/behaviors/SideRect.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/qtquick1/animation/behaviors/behavior-example.qml b/examples/declarative/qtquick1/animation/behaviors/behavior-example.qml index d7140d53b9..60a011cfe7 100644 --- a/examples/declarative/qtquick1/animation/behaviors/behavior-example.qml +++ b/examples/declarative/qtquick1/animation/behaviors/behavior-example.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/qtquick1/animation/behaviors/wigglytext.qml b/examples/declarative/qtquick1/animation/behaviors/wigglytext.qml index e97d9e43b6..dd2c278e4f 100644 --- a/examples/declarative/qtquick1/animation/behaviors/wigglytext.qml +++ b/examples/declarative/qtquick1/animation/behaviors/wigglytext.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/qtquick1/animation/easing/content/QuitButton.qml b/examples/declarative/qtquick1/animation/easing/content/QuitButton.qml index c476b2b443..c0338cccfa 100644 --- a/examples/declarative/qtquick1/animation/easing/content/QuitButton.qml +++ b/examples/declarative/qtquick1/animation/easing/content/QuitButton.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/qtquick1/animation/easing/easing.qml b/examples/declarative/qtquick1/animation/easing/easing.qml index a6f3edd70f..4c8e892f33 100644 --- a/examples/declarative/qtquick1/animation/easing/easing.qml +++ b/examples/declarative/qtquick1/animation/easing/easing.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/qtquick1/animation/states/states.qml b/examples/declarative/qtquick1/animation/states/states.qml index 4a8fa932c7..53510f6bfc 100644 --- a/examples/declarative/qtquick1/animation/states/states.qml +++ b/examples/declarative/qtquick1/animation/states/states.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/qtquick1/animation/states/transitions.qml b/examples/declarative/qtquick1/animation/states/transitions.qml index b067b2760e..407c3a2a36 100644 --- a/examples/declarative/qtquick1/animation/states/transitions.qml +++ b/examples/declarative/qtquick1/animation/states/transitions.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. ** |