1 files changed, 48 insertions, 48 deletions
diff --git a/tests/auto/qscriptvaluegenerated/testgen/testgenerator.cpp b/tests/auto/qscriptvaluegenerated/testgen/testgenerator.cpp
index 681c18e..b57b726 100644
--- a/tests/auto/qscriptvaluegenerated/testgen/testgenerator.cpp
+++ b/tests/auto/qscriptvaluegenerated/testgen/testgenerator.cpp
@@ -1,38 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
+** 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 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
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to 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.
+** 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
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** 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
-** 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.
-**
-** 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.
-**
-**
-**
-**
+** 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.
 **
 **
 ** $QT_END_LICENSE$
@@ -109,39 +109,39 @@ static QString generateLicence()
 {
     return  "/****************************************************************************\n"
             "**\n"
-            "** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).\n"
-            "** Contact: http://www.qt-project.org/\n"
+            "** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).\n"
+            "** Contact: http://www.qt-project.org/legal\n"
             "**\n"
             "** This file is part of the test suite of the Qt Toolkit.\n"
             "**\n"
             "** $QT_BEGIN_LICENSE:LGPL$\n"
+            "** Commercial License Usage\n"
+            "** Licensees holding valid commercial Qt licenses may use this file in\n"
+            "** accordance with the commercial license agreement provided with the\n"
+            "** Software or, alternatively, in accordance with the terms contained in\n"
+            "** a written agreement between you and Digia.  For licensing terms and\n"
+            "** conditions see http://qt.digia.com/licensing.  For further information\n"
+            "** use the contact form at http://qt.digia.com/contact-us.\n"
+            "**\n"
             "** GNU Lesser General Public License Usage\n"
-            "** This file may be used under the terms of the GNU Lesser General Public\n"
-            "** License version 2.1 as published by the Free Software Foundation and\n"
-            "** appearing in the file LICENSE.LGPL included in the packaging of this\n"
-            "** file. Please review the following information to ensure the GNU Lesser\n"
-            "** General Public License version 2.1 requirements will be met:\n"
-            "** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\n"
+            "** Alternatively, this file may be used under the terms of the GNU Lesser\n"
+            "** General Public License version 2.1 as published by the Free Software\n"
+            "** Foundation and appearing in the file LICENSE.LGPL included in the\n"
+            "** packaging of this file.  Please review the following information to\n"
+            "** ensure the GNU Lesser General Public License version 2.1 requirements\n"
+            "** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\n"
             "**\n"
-            "** In addition, as a special exception, Nokia gives you certain additional\n"
-            "** rights. These rights are described in the Nokia Qt LGPL Exception\n"
+            "** In addition, as a special exception, Digia gives you certain additional\n"
+            "** rights.  These rights are described in the Digia Qt LGPL Exception\n"
             "** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.\n"
             "**\n"
             "** GNU General Public License Usage\n"
-            "** Alternatively, this file may be used under the terms of the GNU General\n"
-            "** Public License version 3.0 as published by the Free Software Foundation\n"
-            "** and appearing in the file LICENSE.GPL included in the packaging of this\n"
-            "** file. Please review the following information to ensure the GNU General\n"
-            "** Public License version 3.0 requirements will be met:\n"
-            "** http://www.gnu.org/copyleft/gpl.html.\n"
-            "**\n"
-            "** Other Usage\n"
-            "** Alternatively, this file may be used in accordance with the terms and\n"
-            "** conditions contained in a signed written agreement between you and Nokia.\n"
-            "**\n"
-            "**\n"
-            "**\n"
-            "**\n"
+            "** Alternatively, this file may be used under the terms of the GNU\n"
+            "** General Public License version 3.0 as published by the Free Software\n"
+            "** Foundation and appearing in the file LICENSE.GPL included in the\n"
+            "** packaging of this file.  Please review the following information to\n"
+            "** ensure the GNU General Public License version 3.0 requirements will be\n"
+            "** met: http://www.gnu.org/copyleft/gpl.html.\n"
             "**\n"
             "**\n"
             "** $QT_END_LICENSE$\n"