summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2011-04-14 11:58:25 (GMT)
committerGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2011-04-14 11:59:13 (GMT)
commit7b6a7f475119878681c9d0c06b29896ec3fe72c3 (patch)
tree1ecabb19a341af4ea83d4e4b850b1ff8cb36b92c /tests/auto
parent56c3de426d97ab7c8fbb3f5766e1872d6f2e91e9 (diff)
downloadQt-7b6a7f475119878681c9d0c06b29896ec3fe72c3.zip
Qt-7b6a7f475119878681c9d0c06b29896ec3fe72c3.tar.gz
Qt-7b6a7f475119878681c9d0c06b29896ec3fe72c3.tar.bz2
Fix licence headers again for MR 900
See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2 Reviewed-by: Trust me
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp33
1 files changed, 19 insertions, 14 deletions
diff --git a/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp
index bbcdb4c..cfc3f1a 100644
--- a/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp
+++ b/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp
@@ -1,13 +1,18 @@
/****************************************************************************
**
-** Copyright (C) 2011 Klarälvdalens Datakonsult AB,
-** a KDAB Group company, info@kdab.com,
-** author Stephen Kelly <stephen.kelly@kdab.com>
+** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtGui module of the Qt Toolkit.
**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
@@ -20,17 +25,17 @@
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
+** $QT_END_LICENSE$
**
****************************************************************************/