Update contact URL in license headers.

Reviewed-by: Trust Me

16 files changed, 58 insertions, 59 deletions

diff --git a/util/qlalr/compress.cpp b/util/qlalr/compress.cpp
index 72cffb2..261a8dd 100644
--- a/util/qlalr/compress.cpp
+++ b/util/qlalr/compress.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/compress.h b/util/qlalr/compress.h
index 360a36b..39d4945 100644
--- a/util/qlalr/compress.h
+++ b/util/qlalr/compress.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp
index 520b44f..987f3f6 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -49,47 +49,46 @@
 QString CppGenerator::trollCopyrightHeader() const
 {
   return QLatin1String(
-
-"/****************************************************************************\n"
-"**\n"
-"** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
-"** Contact: Nokia Corporation (qt-info@nokia.com)\n"
-"**\n"
-"** This file is part of the QtCore module of the Qt Toolkit.\n"
-"**\n"
-"** $QT_BEGIN_LICENSE:LGPL$\n"
-"** No Commercial Usage\n"
-"** This file contains pre-release code and may not be distributed.\n"
-"** You may use this file in accordance with the terms and conditions\n"
-"** contained in the either Technology Preview License Agreement or the\n"
-"** Beta Release License Agreement.\n"
-"**\n"
-"** GNU Lesser General Public License Usage\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\n"
-"** additional rights. These rights are described in the Nokia Qt LGPL\n"
-"** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this\n"
-"** package.\n"
-"**\n"
-"** GNU General Public License Usage\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"
-"** If you are unsure which license is appropriate for your use, please\n"
-"** contact the sales department at http://www.qtsoftware.com/contact.\n"
-"** $QT_END_LICENSE$\n"
-"**\n"
-"****************************************************************************/\n"
+    "/****************************************************************************\n"
+    "**\n"
+    "** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
+    "** Contact: Nokia Corporation (qt-info@nokia.com)\n"
+    "**\n"
+    "** This file is part of the QtCore module of the Qt Toolkit.\n"
+    "**\n"
+    "** $QT_BEGIN_LICENSE:LGPL$\n"
+    "** No Commercial Usage\n"
+    "** This file contains pre-release code and may not be distributed.\n"
+    "** You may use this file in accordance with the terms and conditions\n"
+    "** contained in the either Technology Preview License Agreement or the\n"
+    "** Beta Release License Agreement.\n"
+    "**\n"
+    "** GNU Lesser General Public License Usage\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\n"
+    "** additional rights. These rights are described in the Nokia Qt LGPL\n"
+    "** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this\n"
+    "** package.\n"
+    "**\n"
+    "** GNU General Public License Usage\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"
+    "** If you are unsure which license is appropriate for your use, please\n"
+    "** contact the sales department at http://qt.nokia.com/contact.\n"
+    "** $QT_END_LICENSE$\n"
+    "**\n"
+    "****************************************************************************/\n"
     "\n");
 }
 
diff --git a/util/qlalr/cppgenerator.h b/util/qlalr/cppgenerator.h
index 0e251ff..e519abc 100644
--- a/util/qlalr/cppgenerator.h
+++ b/util/qlalr/cppgenerator.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/dotgraph.cpp b/util/qlalr/dotgraph.cpp
index b6409ea..c5b7f58 100644
--- a/util/qlalr/dotgraph.cpp
+++ b/util/qlalr/dotgraph.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/dotgraph.h b/util/qlalr/dotgraph.h
index 6c45688..cf52191 100644
--- a/util/qlalr/dotgraph.h
+++ b/util/qlalr/dotgraph.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/grammar.cpp b/util/qlalr/grammar.cpp
index 1d909cb..e91eb24 100644
--- a/util/qlalr/grammar.cpp
+++ b/util/qlalr/grammar.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/grammar_p.h b/util/qlalr/grammar_p.h
index 516dfec..2876e9a 100644
--- a/util/qlalr/grammar_p.h
+++ b/util/qlalr/grammar_p.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/lalr.cpp b/util/qlalr/lalr.cpp
index 103fe4b..489fc68 100644
--- a/util/qlalr/lalr.cpp
+++ b/util/qlalr/lalr.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/lalr.g b/util/qlalr/lalr.g
index 548223f..f7f5bba 100644
--- a/util/qlalr/lalr.g
+++ b/util/qlalr/lalr.g
@@ -34,7 +34,7 @@
 -- met: http://www.gnu.org/copyleft/gpl.html.
 --
 -- If you are unsure which license is appropriate for your use, please
--- contact the sales department at http://www.qtsoftware.com/contact.
+-- contact the sales department at http://qt.nokia.com/contact.
 -- $QT_END_LICENSE$
 --
 -- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -114,7 +114,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -228,7 +228,7 @@ protected:
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/lalr.h b/util/qlalr/lalr.h
index d9c5508..a4955e9 100644
--- a/util/qlalr/lalr.h
+++ b/util/qlalr/lalr.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/main.cpp b/util/qlalr/main.cpp
index 020dd8cc..e78aeb3 100644
--- a/util/qlalr/main.cpp
+++ b/util/qlalr/main.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/parsetable.cpp b/util/qlalr/parsetable.cpp
index 3d48f1d..f6a4058 100644
--- a/util/qlalr/parsetable.cpp
+++ b/util/qlalr/parsetable.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/parsetable.h b/util/qlalr/parsetable.h
index f87e461..b144ff9 100644
--- a/util/qlalr/parsetable.h
+++ b/util/qlalr/parsetable.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/recognizer.cpp b/util/qlalr/recognizer.cpp
index f59dcac..386dc31 100644
--- a/util/qlalr/recognizer.cpp
+++ b/util/qlalr/recognizer.cpp
@@ -35,7 +35,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/util/qlalr/recognizer.h b/util/qlalr/recognizer.h
index 861c2f3..9ac8ee0 100644
--- a/util/qlalr/recognizer.h
+++ b/util/qlalr/recognizer.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/