summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2012-11-26 15:09:56 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-28 09:58:06 +0100
commita3f4613b7fd84ab465a4af0fc94a95e10b5ebc7e (patch)
tree6df0f7a3553c582bd475e6491df15ffbdd0d0335
parent27a802f1988cf228936596e42f968b5ce8b0f2ad (diff)
Change copyright information from Nokia to Digia
Task-number: QTBUG-28156 Change-Id: I3b33ee0a574b7ec5c4f192a40877bf0141ff2df1 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-rw-r--r--examples/activeqt/multiple/multipleax.rc4
-rw-r--r--examples/activeqt/wrapper/wrapperax.rc4
-rw-r--r--tools/testcon/testcon.rc4
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/activeqt/multiple/multipleax.rc b/examples/activeqt/multiple/multipleax.rc
index ef113bd..fa66812 100644
--- a/examples/activeqt/multiple/multipleax.rc
+++ b/examples/activeqt/multiple/multipleax.rc
@@ -15,10 +15,10 @@ BEGIN
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "Nokia Corporation and/or its subsidiary(-ies)"
+ VALUE "CompanyName", "Digia Plc and/or its subsidiary(-ies)"
VALUE "FileDescription", "Multiple Example (ActiveQt)"
VALUE "FileVersion", "1.0.0.0"
- VALUE "LegalCopyright", "Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)."
+ VALUE "LegalCopyright", "Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies)."
VALUE "InternalName", "multipleax.dll"
VALUE "OriginalFilename", "multipleax.dll"
VALUE "ProductName", "Multiple Example (ActiveQt)"
diff --git a/examples/activeqt/wrapper/wrapperax.rc b/examples/activeqt/wrapper/wrapperax.rc
index 4b8fb02..fbbbff0 100644
--- a/examples/activeqt/wrapper/wrapperax.rc
+++ b/examples/activeqt/wrapper/wrapperax.rc
@@ -15,10 +15,10 @@ BEGIN
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "Nokia Corporation and/or its subsidiary(-ies)"
+ VALUE "CompanyName", "Digia Plc and/or its subsidiary(-ies)"
VALUE "FileDescription", "Wrapper Example (ActiveQt)"
VALUE "FileVersion", "1.0.0.0"
- VALUE "LegalCopyright", "Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)."
+ VALUE "LegalCopyright", "Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies)."
VALUE "InternalName", "wrapperax.dll"
VALUE "OriginalFilename", "wrapperax.dll"
VALUE "ProductName", "Wrapper Example (ActiveQt)"
diff --git a/tools/testcon/testcon.rc b/tools/testcon/testcon.rc
index 9bbbac7..acef212 100644
--- a/tools/testcon/testcon.rc
+++ b/tools/testcon/testcon.rc
@@ -19,11 +19,11 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
BLOCK "040904B0"
BEGIN
- VALUE "CompanyName", "Nokia Corporation and/or its subsidiary(-ies)\0"
+ VALUE "CompanyName", "Digia Plc and/or its subsidiary(-ies)\0"
VALUE "FileDescription", "ActiveQt Test Container\0"
VALUE "FileVersion", "1,0,0,1\0"
VALUE "InternalName", "testcon\0"
- VALUE "LegalCopyright", "Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).0"
+ VALUE "LegalCopyright", "Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "testcon.exe\0"
VALUE "ProductName", "ActiveQt Test Container\0"