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/imageelements/content | |
| 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/imageelements/content')
| -rw-r--r-- | examples/declarative/imageelements/content/MyBorderImage.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/imageelements/content/ShadowRectangle.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/imageelements/content/speaker.png | bin | 0 -> 784525 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/imageelements/content/MyBorderImage.qml b/examples/declarative/imageelements/content/MyBorderImage.qml index df44301581..7606c10493 100644 --- a/examples/declarative/imageelements/content/MyBorderImage.qml +++ b/examples/declarative/imageelements/content/MyBorderImage.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/imageelements/content/ShadowRectangle.qml b/examples/declarative/imageelements/content/ShadowRectangle.qml index 4ff7109533..4305c052c4 100644 --- a/examples/declarative/imageelements/content/ShadowRectangle.qml +++ b/examples/declarative/imageelements/content/ShadowRectangle.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/imageelements/content/speaker.png b/examples/declarative/imageelements/content/speaker.png Binary files differnew file mode 100644 index 0000000000..fb0e857859 --- /dev/null +++ b/examples/declarative/imageelements/content/speaker.png |
