diff options
Diffstat (limited to 'tools/assistant')
| -rw-r--r-- | tools/assistant/lib/qhelpgenerator.cpp | 4 | ||||
| -rw-r--r-- | tools/assistant/lib/qhelpgenerator_p.h | 4 | ||||
| -rw-r--r-- | tools/assistant/tools/assistant/assistant.rc | 2 | ||||
| -rw-r--r-- | tools/assistant/tools/assistant/doc/assistant.qdocconf | 2 | ||||
| -rw-r--r-- | tools/assistant/tools/shared/helpgenerator.cpp | 4 | ||||
| -rw-r--r-- | tools/assistant/tools/shared/helpgenerator.h | 4 |
6 files changed, 10 insertions, 10 deletions
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. ** |