Nokia to Digia changes

13 files changed, 17 insertions, 17 deletions

diff --git a/tests/auto/guiapplauncher/test.ts b/tests/auto/guiapplauncher/test.ts
index 79c9c76d1f..d652c7075e 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 Plc</source>
+        <translation>Qt Assistant von Digia Plc</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 Plc</source>
+        <translation>Qt Assistant von Digia Plc</translation>
     </message>
 </context>
 <context>
diff --git a/tools/activeqt/testcon/testcon.rc b/tools/activeqt/testcon/testcon.rc
index 905598f957..589d10d806 100644
--- a/tools/activeqt/testcon/testcon.rc
+++ b/tools/activeqt/testcon/testcon.rc
@@ -19,7 +19,7 @@ VS_VERSION_INFO VERSIONINFO
 		BEGIN
 			BLOCK "040904B0"
 			BEGIN
-				VALUE "CompanyName", "Nokia Corporation and/or its subsidiary(-ies)\0"
+				VALUE "CompanyName", "Digia Plc\0"
 				VALUE "FileDescription", "ActiveQt Test Container\0"
 				VALUE "FileVersion", "1,0,0,1\0"
 				VALUE "InternalName", "testcon\0"
diff --git a/tools/assistant/compat/config.cpp b/tools/assistant/compat/config.cpp
index 4185faee6f..7c60c4bcd8 100644
--- a/tools/assistant/compat/config.cpp
+++ b/tools/assistant/compat/config.cpp
@@ -348,7 +348,7 @@ QString Config::title() const
 {
     QString s = profil->props[QLatin1String("title")];
     if (s.isEmpty())
-        s = QObject::tr("Qt Assistant by Nokia");
+        s = QObject::tr("Qt Assistant by Digia Plc");
     return s;
 }
 
diff --git a/tools/assistant/compat/mainwindow.ui b/tools/assistant/compat/mainwindow.ui
index 0f92be3441..b2f98a6599 100644
--- a/tools/assistant/compat/mainwindow.ui
+++ b/tools/assistant/compat/mainwindow.ui
@@ -51,7 +51,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Qt Assistant by Nokia</string>
+   <string>Qt Assistant by Digia Plc</string>
   </property>
   <widget class="QWidget" name="__qt_central_widget" />
   <widget class="QToolBar" name="Toolbar" >
diff --git a/tools/assistant/tools/assistant/assistant.rc b/tools/assistant/tools/assistant/assistant.rc
index 1bbfa060e0..69ac98f653 100644
--- a/tools/assistant/tools/assistant/assistant.rc
+++ b/tools/assistant/tools/assistant/assistant.rc
@@ -15,7 +15,7 @@ BEGIN
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "CompanyName", "Nokia Corporation and/or its subsidiary(-ies)"
+            VALUE "CompanyName", "Digia Plc"
             VALUE "FileDescription", "Qt Assistant"
             VALUE "FileVersion", "1.0.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies)."
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index b3bf58df38..9005949e39 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -478,8 +478,8 @@ void Configure::parseCmdLine()
             dictionary[ "BUILDDEV" ] = "yes";
         else if( configCmdLine.at(i) == "-nokia-developer" ) {
             cout << "Detected -nokia-developer option" << endl;
-            cout << "Nokia employees and agents are allowed to use this software under" << endl;
-            cout << "the authority of Nokia Corporation and/or its subsidiary(-ies)" << endl;
+            cout << "Digia employees and agents are allowed to use this software under" << endl;
+            cout << "the authority of Digia Plc" << endl;
             dictionary[ "BUILDNOKIA" ] = "yes";
             dictionary[ "BUILDDEV" ] = "yes";
             dictionary["LICENSE_CONFIRMED"] = "yes";
diff --git a/tools/designer/src/designer/Info_mac.plist b/tools/designer/src/designer/Info_mac.plist
index f19176fa72..af0ad8a332 100644
--- a/tools/designer/src/designer/Info_mac.plist
+++ b/tools/designer/src/designer/Info_mac.plist
@@ -30,6 +30,6 @@
                 </dict>
         </array>
 	<key>NOTE</key>
-	<string>Qt/Designer by Nokia Corporation and/or its subsidiary(-ies)</string>
+	<string>Qt/Designer by Digia Plc</string>
 </dict>
 </plist>
diff --git a/tools/designer/src/designer/designer.rc b/tools/designer/src/designer/designer.rc
index a774a55637..c18d229dce 100644
--- a/tools/designer/src/designer/designer.rc
+++ b/tools/designer/src/designer/designer.rc
@@ -15,7 +15,7 @@ BEGIN
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "CompanyName", "Nokia Corporation and/or its subsidiary(-ies)"
+            VALUE "CompanyName", "Digia Plc"
             VALUE "FileDescription", "Qt Designer"
             VALUE "FileVersion", "1.0.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies)."
diff --git a/tools/linguist/linguist/linguist.rc b/tools/linguist/linguist/linguist.rc
index 25bd8a861b..04f106cf7e 100644
--- a/tools/linguist/linguist/linguist.rc
+++ b/tools/linguist/linguist/linguist.rc
@@ -15,7 +15,7 @@ BEGIN
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "CompanyName", "Nokia Corporation and/or its subsidiary(-ies)"
+            VALUE "CompanyName", "Digia Plc"
             VALUE "FileDescription", "Qt Linguist"
             VALUE "FileVersion", "1.0.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies)."
diff --git a/tools/linguist/lrelease/lrelease.1 b/tools/linguist/lrelease/lrelease.1
index 4ff83e2d4b..c1d76966e9 100644
--- a/tools/linguist/lrelease/lrelease.1
+++ b/tools/linguist/lrelease/lrelease.1
@@ -1,4 +1,4 @@
-.TH lrelease 1 "18 October 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*-
+.TH lrelease 1 "18 October 2001" "Digia Plc" \" -*- nroff -*-
 .\"
 .\" Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 .\" All rights reserved.
diff --git a/tools/linguist/lupdate/lupdate.1 b/tools/linguist/lupdate/lupdate.1
index ebe8ced980..33bd073b85 100644
--- a/tools/linguist/lupdate/lupdate.1
+++ b/tools/linguist/lupdate/lupdate.1
@@ -1,4 +1,4 @@
-.TH lupdate 1 "18 October 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*-
+.TH lupdate 1 "18 October 2001" "Digia Plc" \" -*- nroff -*-
 .\"
 .\" Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 .\" All rights reserved.
diff --git a/tools/linguist/qdoc.conf b/tools/linguist/qdoc.conf
index 31d44d5a54..1e4b662381 100644
--- a/tools/linguist/qdoc.conf
+++ b/tools/linguist/qdoc.conf
@@ -3,7 +3,7 @@ DOCDIRS         = $QTDIR/tools/linguist/doc
 EXAMPLEDIRS     = $QTDIR/tools/linguist/tutorial
 OUTPUTDIR	= $QTDIR/tools/linguist/doc/html
 BASE		= file:$QTDIR/tools/linguist/doc/html/
-COMPANY		= Nokia Corporation and/or its subsidiary(-ies)
+COMPANY		= Digia Plc
 PRODUCT		= Qt Linguist
 VERSIONSYM	= QT_VERSION_STR
 DEFINE		= QT_QDOC QT_.*_SUPPORT _WS_.*_
diff --git a/tools/qdoc3/mangenerator.cpp b/tools/qdoc3/mangenerator.cpp
index e34996b401..14ffa1d48d 100644
--- a/tools/qdoc3/mangenerator.cpp
+++ b/tools/qdoc3/mangenerator.cpp
@@ -198,7 +198,7 @@ void ManGenerator::generateHeader( const QString& name )
     out() << ".TH " << protectArg( name )
 	  << " " << protectArg( "3qt" )
 	  << " " << protectArg( date )
-	  << " " << protectArg( "Nokia Corporation and/or its subsidiary(-ies)" )
+	  << " " << protectArg( "Digia Plc" )
 	  << " " << protectArg( "Qt Toolkit" ) << "\n";
 }