diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 13:20:58 +1000 |
---|---|---|
committer | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 13:21:54 +1000 |
commit | ec97f1cf507963320aa06c59c3ff3baa2cafa6aa (patch) | |
tree | c351d55d5a606c81c72e481f846b9b9e2603c883 /tests/testapplications | |
parent | 36bd7f616f37f5f60e59bce1f0d8970248d627de (diff) | |
parent | 0284817d6cd7e17afa8da26ee6e9199100754446 (diff) |
Merge remote branch 'gerrit/api_changes' into merge-master
Change-Id: I9c54ff2a8aadb2bf95667eb3cf0a48f8291ce927
Diffstat (limited to 'tests/testapplications')
-rw-r--r-- | tests/testapplications/qsgimage/ImageNG.qml | 2 | ||||
-rw-r--r-- | tests/testapplications/qsgimage/img-align.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/testapplications/qsgimage/ImageNG.qml b/tests/testapplications/qsgimage/ImageNG.qml index fbcef04662..afc4d0c22e 100644 --- a/tests/testapplications/qsgimage/ImageNG.qml +++ b/tests/testapplications/qsgimage/ImageNG.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage diff --git a/tests/testapplications/qsgimage/img-align.qml b/tests/testapplications/qsgimage/img-align.qml index b751e006a5..7d118f7538 100644 --- a/tests/testapplications/qsgimage/img-align.qml +++ b/tests/testapplications/qsgimage/img-align.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage |