diff options
Diffstat (limited to 'tools')
33 files changed, 47 insertions, 47 deletions
diff --git a/tools/activeqt/testcon/testcon.rc b/tools/activeqt/testcon/testcon.rc index 905598f957..acef212715 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 and/or its subsidiary(-ies)\0" VALUE "FileDescription", "ActiveQt Test Container\0" VALUE "FileVersion", "1,0,0,1\0" VALUE "InternalName", "testcon\0" diff --git a/tools/assistant/lib/qhelpgenerator.cpp b/tools/assistant/lib/qhelpgenerator.cpp index 90dac0cc62..c2a784af55 100644 --- a/tools/assistant/lib/qhelpgenerator.cpp +++ b/tools/assistant/lib/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 Qt Assistant of the Qt Toolkit. ** diff --git a/tools/assistant/lib/qhelpgenerator_p.h b/tools/assistant/lib/qhelpgenerator_p.h index 55c9b750f3..0c531459b4 100644 --- a/tools/assistant/lib/qhelpgenerator_p.h +++ b/tools/assistant/lib/qhelpgenerator_p.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 Qt Assistant of the Qt Toolkit. ** diff --git a/tools/assistant/tools/assistant/assistant.rc b/tools/assistant/tools/assistant/assistant.rc index 1bbfa060e0..d9a986ac08 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 and/or its subsidiary(-ies)" 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/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf index 34ebfdd3ce..dce3231e47 100644 --- a/tools/assistant/tools/assistant/doc/assistant.qdocconf +++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf @@ -10,7 +10,7 @@ description = "Qt Assistant" HTML.{postheader,address} = "" 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 © 2011 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \ + "<td width=\"30%\" align=\"left\">Copyright © 2011 Digia Plc and/or its subsidiary(-ies)</td>\n" \ "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \ "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.7.6</div></td>\n" \ "</tr></table></div></address>" diff --git a/tools/assistant/tools/shared/helpgenerator.cpp b/tools/assistant/tools/shared/helpgenerator.cpp index 48a2d2b5fa..b2abcff8ef 100644 --- a/tools/assistant/tools/shared/helpgenerator.cpp +++ b/tools/assistant/tools/shared/helpgenerator.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 Qt Assistant of the Qt Toolkit. ** diff --git a/tools/assistant/tools/shared/helpgenerator.h b/tools/assistant/tools/shared/helpgenerator.h index a32317fcdd..6f5fa6c4bc 100644 --- a/tools/assistant/tools/shared/helpgenerator.h +++ b/tools/assistant/tools/shared/helpgenerator.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 Qt Assistant of the Qt Toolkit. ** diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index b169a517d0..6d04600877 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -517,7 +517,7 @@ void Configure::parseCmdLine() 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 << "the authority of Digia Plc and/or its subsidiary(-ies)" << endl; dictionary[ "BUILDNOKIA" ] = "yes"; dictionary[ "BUILDDEV" ] = "yes"; dictionary["LICENSE_CONFIRMED"] = "yes"; diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index bdfd77082a..4c4a7abc4f 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -207,7 +207,7 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString if (dictionary.value("DONE") == "error") { cout << "You are not licensed for the " << dictionary["PLATFORM NAME"] << " platform." << endl << endl; - cout << "Please contact qt-info@nokia.com to upgrade your license" << endl; + cout << "Please contact http://www.qt-project.org/legal to upgrade your license" << endl; cout << "to include the " << dictionary["PLATFORM NAME"] << " platform, or install the" << endl; cout << "Qt Open Source Edition if you intend to develop free software." << endl; return; diff --git a/tools/designer/src/designer/Info_mac.plist b/tools/designer/src/designer/Info_mac.plist index f19176fa72..c955f8470c 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 and/or its subsidiary(-ies)</string> </dict> </plist> diff --git a/tools/designer/src/designer/designer.rc b/tools/designer/src/designer/designer.rc index a774a55637..a889d631b1 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 and/or its subsidiary(-ies)" 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/doxygen/config/footer.html b/tools/doxygen/config/footer.html index 8e99c72fef..690e19c6a3 100644 --- a/tools/doxygen/config/footer.html +++ b/tools/doxygen/config/footer.html @@ -1,6 +1,6 @@ <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> -<td width="30%">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies).</td> +<td width="30%">Copyright © 2010 Digia Plc and/or its subsidiary(-ies).</td> <td width="40%" align="center"><a href="trademarks.html">Trademarks</a></td> <td width="30%" align="right"><div align="right">Qt $projectnumber</div></td> </tr></table></div></address> diff --git a/tools/linguist/linguist/linguist.rc b/tools/linguist/linguist/linguist.rc index 25bd8a861b..505421f72c 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 and/or its subsidiary(-ies)" 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..9cc6284676 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 and/or its subsidiary(-ies)" \" -*- 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..6debb5f4f0 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 and/or its subsidiary(-ies)" \" -*- 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..8672f96c57 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 and/or its subsidiary(-ies) PRODUCT = Qt Linguist VERSIONSYM = QT_VERSION_STR DEFINE = QT_QDOC QT_.*_SUPPORT _WS_.*_ diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index f792d18f59..2a2ebacb60 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.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 tools applications of the Qt Toolkit. ** diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h index a646d0a0e8..70b0beab77 100644 --- a/tools/qdoc3/ditaxmlgenerator.h +++ b/tools/qdoc3/ditaxmlgenerator.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 tools applications of the Qt Toolkit. ** diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp index f126d003a5..059091e263 100644 --- a/tools/qdoc3/generator.cpp +++ b/tools/qdoc3/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 tools applications of the Qt Toolkit. ** diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h index f6b210e00c..a243efa10d 100644 --- a/tools/qdoc3/generator.h +++ b/tools/qdoc3/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 tools applications of the Qt Toolkit. ** diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 3189e5b835..32da1b78b4 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/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 tools applications of the Qt Toolkit. ** diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index 8d554afd9d..660008f6c5 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/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 tools applications of the Qt Toolkit. ** diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp index 743423a0de..430302e544 100644 --- a/tools/qdoc3/pagegenerator.cpp +++ b/tools/qdoc3/pagegenerator.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 tools applications of the Qt Toolkit. ** diff --git a/tools/qdoc3/pagegenerator.h b/tools/qdoc3/pagegenerator.h index d62801a43b..a014a64ee9 100644 --- a/tools/qdoc3/pagegenerator.h +++ b/tools/qdoc3/pagegenerator.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 tools applications of the Qt Toolkit. ** diff --git a/tools/qdoc3/test/carbide-eclipse-integration.qdocconf b/tools/qdoc3/test/carbide-eclipse-integration.qdocconf index 4d434031e0..c6eef6221b 100644 --- a/tools/qdoc3/test/carbide-eclipse-integration.qdocconf +++ b/tools/qdoc3/test/carbide-eclipse-integration.qdocconf @@ -6,7 +6,7 @@ macro.TheEclipseIntegration = Carbide.c++ 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 © 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \ + "<td width=\"30%\" align=\"left\">Copyright © 2010 Digia Plc and/or its subsidiary(-ies)</td>\n" \ "<td width=\"40%\" align=\"center\"><a href=\"http://qt.nokia.com/doc\">Trademarks</a></td>\n" \ "<td width=\"30%\" align=\"right\"><div align=\"right\">Carbide.c++</div></td>\n" \ "</tr></table></div></address>" diff --git a/tools/qdoc3/test/jambi.qdocconf b/tools/qdoc3/test/jambi.qdocconf index aa87826c64..a72edf00d2 100644 --- a/tools/qdoc3/test/jambi.qdocconf +++ b/tools/qdoc3/test/jambi.qdocconf @@ -42,7 +42,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 © 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \ + "<td width=\"30%\" align=\"left\">Copyright © 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 Jambi \\version</div></td>\n" \ "</tr></table></div></address>" diff --git a/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf b/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf index 7cb04bea37..411e996827 100644 --- a/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf @@ -147,7 +147,7 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2008-2010 Nokia Corporation and/or its\n" \ + " <acronym title=\"Copyright\">©</acronym> 2008-2010 Digia Plc and/or its\n" \ " subsidiaries. Qt and their respective logos are trademarks of Digia Plc \n" \ " in Finland and/or other countries worldwide.</p>\n" \ " <p>\n" \ diff --git a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf index f5f191513f..4911290138 100644 --- a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf @@ -36,7 +36,7 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2008-2010 Nokia Corporation and/or its\n" \ + " <acronym title=\"Copyright\">©</acronym> 2008-2010 Digia Plc and/or its\n" \ " subsidiaries. Qt and their respective logos are trademarks of Digia Plc \n" \ " in Finland and/or other countries worldwide.</p>\n" \ " <p>\n" \ diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf index 88da7e7759..496e149746 100644 --- a/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf @@ -147,7 +147,7 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2008-2010 Nokia Corporation and/or its\n" \ + " <acronym title=\"Copyright\">©</acronym> 2008-2010 Digia Plc and/or its\n" \ " subsidiaries. Qt and their respective logos are trademarks of Digia Plc \n" \ " in Finland and/or other countries worldwide.</p>\n" \ " <p>\n" \ diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf index ea9e6fa9df..01b9ad6c17 100644 --- a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf @@ -149,7 +149,7 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2008-2010 Nokia Corporation and/or its\n" \ + " <acronym title=\"Copyright\">©</acronym> 2008-2010 Digia Plc and/or its\n" \ " subsidiaries. Qt and their respective logos are trademarks of Digia Plc \n" \ " in Finland and/or other countries worldwide.</p>\n" \ " <p>\n" \ diff --git a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf index 96c2c98780..82d61857e9 100644 --- a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf +++ b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf @@ -5,7 +5,7 @@ macro.TheEclipseIntegration = The Qt Eclipse Integration 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 © 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \ + "<td width=\"30%\" align=\"left\">Copyright © 2010 Digia Plc and/or its subsidiary(-ies)</td>\n" \ "<td width=\"40%\" align=\"center\"><a href=\"http://qt.nokia.com/doc/trademarks.html\">Trademarks</a></td>\n" \ "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Eclipse Integration 1.5.3</div></td>\n" \ "</tr></table></div></address>" diff --git a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp index 2bd69f5d1e..8c0d60857f 100644 --- a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp +++ b/tools/qtconcurrent/codegenerator/src/codegenerator.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 tools applications of the Qt Toolkit. ** diff --git a/tools/qtconcurrent/codegenerator/src/codegenerator.h b/tools/qtconcurrent/codegenerator/src/codegenerator.h index c812823c6c..4bec47d618 100644 --- a/tools/qtconcurrent/codegenerator/src/codegenerator.h +++ b/tools/qtconcurrent/codegenerator/src/codegenerator.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 tools applications of the Qt Toolkit. ** |