Nokia corp to Digia Plc and contact info changes

6 files changed, 14 insertions, 14 deletions

diff --git a/util/lexgen/generator.cpp b/util/lexgen/generator.cpp
index c5b67b38b7..208e36247d 100644
--- a/util/lexgen/generator.cpp
+++ b/util/lexgen/generator.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Digia Plc (http://www.qt-project.org/legal)
 **
 ** This file is part of the utils of the Qt Toolkit.
 **
diff --git a/util/lexgen/generator.h b/util/lexgen/generator.h
index 1dd2d0984c..b320a71895 100644
--- a/util/lexgen/generator.h
+++ b/util/lexgen/generator.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Digia Plc (http://www.qt-project.org/legal)
 **
 ** This file is part of the utils of the Qt Toolkit.
 **
diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp
index bf8a49371c..f4ae86478d 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Digia Plc (http://www.qt-project.org/legal)
 **
 ** This file is part of the utils of the Qt Toolkit.
 **
@@ -52,9 +52,9 @@ QString CppGenerator::copyrightHeader() const
   return QLatin1String(
     "/****************************************************************************\n"
     "**\n"
-    "** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).\n"
+    "** Copyright (C) 2011 Digia Plc and/or its subsidiary(-ies).\n"
     "** All rights reserved.\n"
-    "** Contact: Nokia Corporation (qt-info@nokia.com)\n"
+    "** Contact: Digia Plc (http://www.qt-project.org/legal)\n"
     "**\n"
     "** This file is part of the QtCore module of the Qt Toolkit.\n"
     "**\n"
diff --git a/util/qlalr/cppgenerator.h b/util/qlalr/cppgenerator.h
index 6ccfbe1f68..8c597de716 100644
--- a/util/qlalr/cppgenerator.h
+++ b/util/qlalr/cppgenerator.h
@@ -1,8 +1,8 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Digia Plc and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Digia Plc (http://www.qt-project.org/legal)
 **
 ** This file is part of the utils of the Qt Toolkit.
 **
diff --git a/util/qlalr/doc/qlalr.qdocconf b/util/qlalr/doc/qlalr.qdocconf
index ea9eaa6f93..bb60e7c44d 100644
--- a/util/qlalr/doc/qlalr.qdocconf
+++ b/util/qlalr/doc/qlalr.qdocconf
@@ -59,7 +59,7 @@ HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0
 
 HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
                           "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-                          "<td width=\"30%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
+                          "<td width=\"30%\" align=\"left\">Copyright &copy; 2010 Digia Plc and/or its subsidiary(-ies)</td>\n" \
                           "<td width=\"40%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
                           "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
                           "</tr></table></div></address>"
diff --git a/util/s60pixelmetrics/pm_mapper.pkg b/util/s60pixelmetrics/pm_mapper.pkg
index e0952753ff..afa8a8ddd2 100644
--- a/util/s60pixelmetrics/pm_mapper.pkg
+++ b/util/s60pixelmetrics/pm_mapper.pkg
@@ -8,12 +8,12 @@
 ;  Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ;  This material, including documentation and any related
 ;  computer programs, is protected by copyright controlled by
-;  Nokia Corporation. All rights are reserved. Copying,
+;  Digia Plc. All rights are reserved. Copying,
 ;  including reproducing, storing, adapting or translating, any
 ;  or all of this material requires the prior written consent of
-;  Nokia Corporation. This material also contains confidential
+;  Digia Plc. This material also contains confidential
 ;  information which may not be disclosed to others without the
-;  prior written consent of Nokia Corporation.
+;  prior written consent of Digia Plc.
 ; ==============================================================================