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 /tests/testapplications/text | |
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 'tests/testapplications/text')
-rw-r--r-- | tests/testapplications/text/Button.qml | 2 | ||||
-rw-r--r-- | tests/testapplications/text/ControlView.qml | 2 | ||||
-rw-r--r-- | tests/testapplications/text/text.qml | 2 | ||||
-rw-r--r-- | tests/testapplications/text/textedit.qml | 2 | ||||
-rw-r--r-- | tests/testapplications/text/textinput.qml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/testapplications/text/Button.qml b/tests/testapplications/text/Button.qml index 3a0ea80b06..a59d95abc5 100644 --- a/tests/testapplications/text/Button.qml +++ b/tests/testapplications/text/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 test suite of the Qt Toolkit. ** diff --git a/tests/testapplications/text/ControlView.qml b/tests/testapplications/text/ControlView.qml index 1bc45d8fad..2dbd475715 100644 --- a/tests/testapplications/text/ControlView.qml +++ b/tests/testapplications/text/ControlView.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 test suite of the Qt Toolkit. ** diff --git a/tests/testapplications/text/text.qml b/tests/testapplications/text/text.qml index 063c06c245..d02e6a027e 100644 --- a/tests/testapplications/text/text.qml +++ b/tests/testapplications/text/text.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 test suite of the Qt Toolkit. ** diff --git a/tests/testapplications/text/textedit.qml b/tests/testapplications/text/textedit.qml index ff94ca5943..25a02ad9a2 100644 --- a/tests/testapplications/text/textedit.qml +++ b/tests/testapplications/text/textedit.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 test suite of the Qt Toolkit. ** diff --git a/tests/testapplications/text/textinput.qml b/tests/testapplications/text/textinput.qml index be8236a9db..4638604b91 100644 --- a/tests/testapplications/text/textinput.qml +++ b/tests/testapplications/text/textinput.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 test suite of the Qt Toolkit. ** |