Nokia corp to Digia Plc and contact info changes

20 files changed, 40 insertions, 40 deletions

diff --git a/tests/arthur/datagenerator/datagenerator.cpp b/tests/arthur/datagenerator/datagenerator.cpp
index 440ff2c18e..2a0d40e8f8 100644
--- a/tests/arthur/datagenerator/datagenerator.cpp
+++ b/tests/arthur/datagenerator/datagenerator.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 test suite of the Qt Toolkit.
 **
diff --git a/tests/arthur/datagenerator/datagenerator.h b/tests/arthur/datagenerator/datagenerator.h
index 8881da7cdc..1c800bcec5 100644
--- a/tests/arthur/datagenerator/datagenerator.h
+++ b/tests/arthur/datagenerator/datagenerator.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 test suite of the Qt Toolkit.
 **
diff --git a/tests/arthur/datagenerator/xmlgenerator.cpp b/tests/arthur/datagenerator/xmlgenerator.cpp
index 874fac35f3..3c8bbf660e 100644
--- a/tests/arthur/datagenerator/xmlgenerator.cpp
+++ b/tests/arthur/datagenerator/xmlgenerator.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 test suite of the Qt Toolkit.
 **
diff --git a/tests/arthur/datagenerator/xmlgenerator.h b/tests/arthur/datagenerator/xmlgenerator.h
index 6a4ed77344..944e1c3e6b 100644
--- a/tests/arthur/datagenerator/xmlgenerator.h
+++ b/tests/arthur/datagenerator/xmlgenerator.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 test suite of the Qt Toolkit.
 **
diff --git a/tests/arthur/htmlgenerator/htmlgenerator.cpp b/tests/arthur/htmlgenerator/htmlgenerator.cpp
index 2a68e621d0..a4165647d9 100644
--- a/tests/arthur/htmlgenerator/htmlgenerator.cpp
+++ b/tests/arthur/htmlgenerator/htmlgenerator.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 test suite of the Qt Toolkit.
 **
diff --git a/tests/arthur/htmlgenerator/htmlgenerator.h b/tests/arthur/htmlgenerator/htmlgenerator.h
index 126f1d5cdd..250d302211 100644
--- a/tests/arthur/htmlgenerator/htmlgenerator.h
+++ b/tests/arthur/htmlgenerator/htmlgenerator.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 test suite of the Qt Toolkit.
 **
diff --git a/tests/auto/guiapplauncher/test.ts b/tests/auto/guiapplauncher/test.ts
index 79c9c76d1f..6cc463adfe 100644
--- a/tests/auto/guiapplauncher/test.ts
+++ b/tests/auto/guiapplauncher/test.ts
@@ -516,8 +516,8 @@ Assistent ist nicht einsatzbereit!</translation>
     </message>
     <message>
         <location/>
-        <source>Qt Assistant by Nokia</source>
-        <translation>Qt Assistant von Nokia</translation>
+        <source>Qt Assistant by Digia</source>
+        <translation>Qt Assistant von Digia</translation>
     </message>
     <message>
         <location/>
@@ -850,8 +850,8 @@ Assistent ist nicht einsatzbereit!</translation>
     <name>QObject</name>
     <message>
         <location filename="../tools/assistant/compat/config.cpp" line="+350"/>
-        <source>Qt Assistant by Nokia</source>
-        <translation>Qt Assistant von Nokia</translation>
+        <source>Qt Assistant by Digia</source>
+        <translation>Qt Assistant von Digia</translation>
     </message>
 </context>
 <context>
diff --git a/tests/auto/headers/tst_headers.cpp b/tests/auto/headers/tst_headers.cpp
index d970498c29..dcf811ad47 100644
--- a/tests/auto/headers/tst_headers.cpp
+++ b/tests/auto/headers/tst_headers.cpp
@@ -79,7 +79,7 @@ private:
 };
 
 tst_Headers::tst_Headers() :
-    copyrightPattern("\\*\\* Copyright \\(C\\) 20[0-9][0-9] Nokia Corporation and/or its subsidiary\\(-ies\\)."),
+    copyrightPattern("\\*\\* Copyright \\(C\\) 20[0-9][0-9] Digia Plc and/or its subsidiary\\(-ies\\)."),
     licensePattern("\\*\\* \\$QT_BEGIN_LICENSE:(LGPL|BSD|3RDPARTY|LGPL-ONLY|FDL)\\$"),
     moduleTest(QLatin1String("\\*\\* This file is part of the .+ of the Qt Toolkit."))
 {
diff --git a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp
index 5c43a17561..aa2a8ec264 100644
--- a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp
+++ b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp
@@ -450,7 +450,7 @@ void tst_QHelpEngineCore::setAutoSaveFilter()
 void tst_QHelpEngineCore::metaData()
 {
     QCOMPARE(QHelpEngineCore::metaData(m_path + "/data/test.qch", "author").toString(),
-        QString("Nokia Corporation and/or its subsidiary(-ies)"));
+        QString("Digia Plc and/or its subsidiary(-ies)"));
     QCOMPARE(QHelpEngineCore::metaData(m_path + "/data/test.qch", "notExisting").isValid(),
         false);
 }
diff --git a/tests/auto/qhelpgenerator/data/test.qhp b/tests/auto/qhelpgenerator/data/test.qhp
index 2c3f128ec6..716c048f4f 100644
--- a/tests/auto/qhelpgenerator/data/test.qhp
+++ b/tests/auto/qhelpgenerator/data/test.qhp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <QtHelpProject version="1.0">
-    <metaData name="author" value="Nokia Corporation and/or its subsidiary(-ies)" />
+    <metaData name="author" value="Digia Plc and/or its subsidiary(-ies)" />
     <metaData name="language" value="en" />
 	<virtualFolder>testFolder</virtualFolder>
 	<namespace>trolltech.com.1.0.0.test</namespace>
diff --git a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp
index e410c892e8..a38dd3f746 100644
--- a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp
+++ b/tests/auto/qhelpgenerator/tst_qhelpgenerator.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 test suite of the Qt Toolkit.
 **
@@ -207,7 +207,7 @@ void tst_QHelpGenerator::checkMetaData()
     m_query->exec("SELECT Value FROM MetaDataTable WHERE Name=\'author\'");
     if (!m_query->next())
         QFAIL("Meta Data Error");
-    QCOMPARE(m_query->value(0).toString(), QString("Nokia Corporation and/or its subsidiary(-ies)"));
+    QCOMPARE(m_query->value(0).toString(), QString("Digia Plc and/or its subsidiary(-ies)"));
 }
 
 QTEST_MAIN(tst_QHelpGenerator)
diff --git a/tests/auto/qhelpprojectdata/data/test.qhp b/tests/auto/qhelpprojectdata/data/test.qhp
index 1e9074a159..ea15a812e7 100644
--- a/tests/auto/qhelpprojectdata/data/test.qhp
+++ b/tests/auto/qhelpprojectdata/data/test.qhp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <QtHelpProject version="1.0">
-    <metaData name="author" value="Nokia Corporation and/or its subsidiary(-ies)" />
+    <metaData name="author" value="Digia Plc and/or its subsidiary(-ies)" />
     <metaData name="language" value="en" />
 	<virtualFolder>testFolder</virtualFolder>
 	<namespace>trolltech.com.1.0.0.test</namespace>
diff --git a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp
index e6338ebee3..2b28804fe5 100644
--- a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp
+++ b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp
@@ -173,7 +173,7 @@ void tst_QHelpProjectData::metaData()
 
     QCOMPARE(data.metaData().count(), 2);
     QCOMPARE(data.metaData().value("author").toString(),
-        QString("Nokia Corporation and/or its subsidiary(-ies)"));
+        QString("Digia Plc and/or its subsidiary(-ies)"));
 }
 
 void tst_QHelpProjectData::rootPath()
diff --git a/tests/auto/qnetworkreply/certs/fluke.cert b/tests/auto/qnetworkreply/certs/fluke.cert
index 069fa6b341..d59ad34282 100644
--- a/tests/auto/qnetworkreply/certs/fluke.cert
+++ b/tests/auto/qnetworkreply/certs/fluke.cert
@@ -3,11 +3,11 @@ Certificate:
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=NO, ST=Oslo, L=Nydalen, O=Nokia Corporation and/or its subsidiary(-ies), OU=Development, CN=fluke.troll.no/emailAddress=ahanssen@trolltech.com
+        Issuer: C=NO, ST=Oslo, L=Nydalen, O=Digia Plc and/or its subsidiary(-ies), OU=Development, CN=fluke.troll.no/emailAddress=ahanssen@trolltech.com
         Validity
             Not Before: Dec  4 01:10:32 2007 GMT
             Not After : Apr 21 01:10:32 2035 GMT
-        Subject: C=NO, ST=Oslo, O=Nokia Corporation and/or its subsidiary(-ies), OU=Development, CN=fluke.troll.no
+        Subject: C=NO, ST=Oslo, O=Digia Plc and/or its subsidiary(-ies), OU=Development, CN=fluke.troll.no
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
@@ -30,7 +30,7 @@ Certificate:
             X509v3 Subject Key Identifier: 
                 21:85:04:3D:23:01:66:E5:F7:9F:1A:84:24:8A:AF:0A:79:F4:E5:AC
             X509v3 Authority Key Identifier: 
-                DirName:/C=NO/ST=Oslo/L=Nydalen/O=Nokia Corporation and/or its subsidiary(-ies)/OU=Development/CN=fluke.troll.no/emailAddress=ahanssen@trolltech.com
+                DirName:/C=NO/ST=Oslo/L=Nydalen/O=Digia Plc and/or its subsidiary(-ies)/OU=Development/CN=fluke.troll.no/emailAddress=ahanssen@trolltech.com
                 serial:8E:A8:B4:E8:91:B7:54:2E
 
     Signature Algorithm: sha1WithRSAEncryption
diff --git a/tests/auto/qscriptvalue/testgen/testgenerator.cpp b/tests/auto/qscriptvalue/testgen/testgenerator.cpp
index 586310d0ee..16b99bc865 100644
--- a/tests/auto/qscriptvalue/testgen/testgenerator.cpp
+++ b/tests/auto/qscriptvalue/testgen/testgenerator.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 test suite of the Qt Toolkit.
 **
@@ -110,9 +110,9 @@ static QString generateLicence()
 {
     return  "/****************************************************************************\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 test suite of the Qt Toolkit.\n"
             "**\n"
diff --git a/tests/auto/qscriptvalue/testgen/testgenerator.h b/tests/auto/qscriptvalue/testgen/testgenerator.h
index 3838f2beeb..86d9baefca 100644
--- a/tests/auto/qscriptvalue/testgen/testgenerator.h
+++ b/tests/auto/qscriptvalue/testgen/testgenerator.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 test suite of the Qt Toolkit.
 **
diff --git a/tests/auto/qsslsocket/certs/fluke.cert b/tests/auto/qsslsocket/certs/fluke.cert
index 069fa6b341..d59ad34282 100644
--- a/tests/auto/qsslsocket/certs/fluke.cert
+++ b/tests/auto/qsslsocket/certs/fluke.cert
@@ -3,11 +3,11 @@ Certificate:
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=NO, ST=Oslo, L=Nydalen, O=Nokia Corporation and/or its subsidiary(-ies), OU=Development, CN=fluke.troll.no/emailAddress=ahanssen@trolltech.com
+        Issuer: C=NO, ST=Oslo, L=Nydalen, O=Digia Plc and/or its subsidiary(-ies), OU=Development, CN=fluke.troll.no/emailAddress=ahanssen@trolltech.com
         Validity
             Not Before: Dec  4 01:10:32 2007 GMT
             Not After : Apr 21 01:10:32 2035 GMT
-        Subject: C=NO, ST=Oslo, O=Nokia Corporation and/or its subsidiary(-ies), OU=Development, CN=fluke.troll.no
+        Subject: C=NO, ST=Oslo, O=Digia Plc and/or its subsidiary(-ies), OU=Development, CN=fluke.troll.no
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
@@ -30,7 +30,7 @@ Certificate:
             X509v3 Subject Key Identifier: 
                 21:85:04:3D:23:01:66:E5:F7:9F:1A:84:24:8A:AF:0A:79:F4:E5:AC
             X509v3 Authority Key Identifier: 
-                DirName:/C=NO/ST=Oslo/L=Nydalen/O=Nokia Corporation and/or its subsidiary(-ies)/OU=Development/CN=fluke.troll.no/emailAddress=ahanssen@trolltech.com
+                DirName:/C=NO/ST=Oslo/L=Nydalen/O=Digia Plc and/or its subsidiary(-ies)/OU=Development/CN=fluke.troll.no/emailAddress=ahanssen@trolltech.com
                 serial:8E:A8:B4:E8:91:B7:54:2E
 
     Signature Algorithm: sha1WithRSAEncryption
diff --git a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
index 68869fd6bc..df6249b830 100644
--- a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
+++ b/tests/auto/qsvggenerator/tst_qsvggenerator.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 test suite of the Qt Toolkit.
 **
diff --git a/tests/auto/uic3/baseline/licenseagreementpage.ui b/tests/auto/uic3/baseline/licenseagreementpage.ui
index 195825dd2a..5d0e9304df 100644
--- a/tests/auto/uic3/baseline/licenseagreementpage.ui
+++ b/tests/auto/uic3/baseline/licenseagreementpage.ui
@@ -105,7 +105,7 @@
                     </property>
                     <property name="text">
                         <string>The license could not be found in the package. The package might be corrupted.


-Please contact qt-info@nokia.com to resolve the problem.</string>
+Please contact http://www.qt-project.org/legal to resolve the problem.</string>
                     </property>
                 </widget>
                 <widget class="QLayoutWidget">
diff --git a/tests/auto/uic3/baseline/licenseagreementpage.ui.4 b/tests/auto/uic3/baseline/licenseagreementpage.ui.4
index 8d81c5cd11..0bf98d3b53 100644
--- a/tests/auto/uic3/baseline/licenseagreementpage.ui.4
+++ b/tests/auto/uic3/baseline/licenseagreementpage.ui.4
@@ -89,7 +89,7 @@
             <widget class="Q3TextView" name="introText">
               <property name="text">
                 <string>The license could not be found in the package. The package might be corrupted.


-Please contact qt-info@nokia.com to resolve the problem.</string>
+Please contact http://www.qt-project.org/legal to resolve the problem.</string>
               </property>
             </widget>
           </item>