From 1fba98cfa3590ef742cbe082bf4478c2703ea3c5 Mon Sep 17 00:00:00 2001 From: jutaipal Date: Tue, 11 Dec 2012 01:03:29 -0800 Subject: Nokia to Digia changes --- tests/auto/guiapplauncher/test.ts | 8 ++++---- tools/activeqt/testcon/testcon.rc | 2 +- tools/assistant/compat/config.cpp | 2 +- tools/assistant/compat/mainwindow.ui | 2 +- tools/assistant/tools/assistant/assistant.rc | 2 +- tools/configure/configureapp.cpp | 4 ++-- tools/designer/src/designer/Info_mac.plist | 2 +- tools/designer/src/designer/designer.rc | 2 +- tools/linguist/linguist/linguist.rc | 2 +- tools/linguist/lrelease/lrelease.1 | 2 +- tools/linguist/lupdate/lupdate.1 | 2 +- tools/linguist/qdoc.conf | 2 +- tools/qdoc3/mangenerator.cpp | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/auto/guiapplauncher/test.ts b/tests/auto/guiapplauncher/test.ts index 79c9c76..d652c70 100644 --- a/tests/auto/guiapplauncher/test.ts +++ b/tests/auto/guiapplauncher/test.ts @@ -516,8 +516,8 @@ Assistent ist nicht einsatzbereit! - Qt Assistant by Nokia - Qt Assistant von Nokia + Qt Assistant by Digia Plc + Qt Assistant von Digia Plc @@ -850,8 +850,8 @@ Assistent ist nicht einsatzbereit! QObject - Qt Assistant by Nokia - Qt Assistant von Nokia + Qt Assistant by Digia Plc + Qt Assistant von Digia Plc diff --git a/tools/activeqt/testcon/testcon.rc b/tools/activeqt/testcon/testcon.rc index 905598f..589d10d 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 4185fae..7c60c4b 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 0f92be3..b2f98a6 100644 --- a/tools/assistant/compat/mainwindow.ui +++ b/tools/assistant/compat/mainwindow.ui @@ -51,7 +51,7 @@ - Qt Assistant by Nokia + Qt Assistant by Digia Plc diff --git a/tools/assistant/tools/assistant/assistant.rc b/tools/assistant/tools/assistant/assistant.rc index 1bbfa06..69ac98f 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 b3bf58d..9005949 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 f19176f..af0ad8a 100644 --- a/tools/designer/src/designer/Info_mac.plist +++ b/tools/designer/src/designer/Info_mac.plist @@ -30,6 +30,6 @@ NOTE - Qt/Designer by Nokia Corporation and/or its subsidiary(-ies) + Qt/Designer by Digia Plc diff --git a/tools/designer/src/designer/designer.rc b/tools/designer/src/designer/designer.rc index a774a55..c18d229 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 25bd8a8..04f106c 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 4ff83e2..c1d7696 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 ebe8ced..33bd073 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 31d44d5..1e4b662 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 e34996b..14ffa1d 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"; } -- cgit v0.12