summaryrefslogtreecommitdiff
path: root/tests/auto/qwebframe
diff options
context:
space:
mode:
authorMarko Valtanen <marko.valtanen@digia.com>2012-12-04 16:12:48 +0200
committerMarko Valtanen <marko.valtanen@digia.com>2012-12-04 16:12:48 +0200
commit663fc99a4cf2f3f64f0a5150f67ea927e360127c (patch)
tree96da1ed84d443ecf8f9ab92d7cb136c44bf8e0b0 /tests/auto/qwebframe
parentfd3384eab190ee53d8abc1fc19a0899ae6a7a7f7 (diff)
downloadqt4-tools-663fc99a4cf2f3f64f0a5150f67ea927e360127c.tar.gz
Change copyrights from Nokia to Digia.
Diffstat (limited to 'tests/auto/qwebframe')
-rw-r--r--tests/auto/qwebframe/dummy.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/tests/auto/qwebframe/dummy.cpp b/tests/auto/qwebframe/dummy.cpp
index 25d6859175..7fc3f340c6 100644
--- a/tests/auto/qwebframe/dummy.cpp
+++ b/tests/auto/qwebframe/dummy.cpp
@@ -1,17 +1,19 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,8 +23,8 @@
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
@@ -33,8 +35,7 @@
** 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.
+**
** $QT_END_LICENSE$
**
****************************************************************************/