From 0f21e6a00cef89fe915090023031dd48474665c0 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 10 Jan 2012 13:50:48 +1000 Subject: Update year in Nokia copyright messages. Manually update strings that did not get fixed by previous search-and-replace. Change-Id: Ie9ff57f08ce0dcf91d28620fa2dc9eeb8e98481e Reviewed-by: Rohan McGovern --- config.profiles/symbian/bld.inf | 2 +- demos/mobile/guitartuner/src/guitartuner.rc | 2 +- examples/webkit/webkit-guide/_copyright.txt | 2 +- examples/webkit/webkit-guide/_image_assets.htm | 2 +- examples/webkit/webkit-guide/_index.html | 2 +- examples/webkit/webkit-guide/anim_accord.htm | 2 +- examples/webkit/webkit-guide/anim_demo-rotate.htm | 2 +- examples/webkit/webkit-guide/anim_demo-scale.htm | 2 +- examples/webkit/webkit-guide/anim_demo-skew.htm | 2 +- examples/webkit/webkit-guide/anim_gallery.htm | 2 +- examples/webkit/webkit-guide/anim_panel.htm | 2 +- examples/webkit/webkit-guide/anim_pulse.htm | 2 +- examples/webkit/webkit-guide/anim_skew.htm | 2 +- examples/webkit/webkit-guide/anim_slide1.htm | 2 +- examples/webkit/webkit-guide/anim_slide2.htm | 2 +- examples/webkit/webkit-guide/anim_slide3.htm | 2 +- examples/webkit/webkit-guide/anim_tabbedSkew.htm | 2 +- examples/webkit/webkit-guide/css3_backgrounds.htm | 2 +- examples/webkit/webkit-guide/css3_border-img.htm | 2 +- examples/webkit/webkit-guide/css3_grad-radial.htm | 2 +- examples/webkit/webkit-guide/css3_gradientBack.htm | 2 +- examples/webkit/webkit-guide/css3_gradientBackStop.htm | 2 +- examples/webkit/webkit-guide/css3_gradientButton.htm | 2 +- examples/webkit/webkit-guide/css3_mask-grad.htm | 2 +- examples/webkit/webkit-guide/css3_mask-img.htm | 2 +- examples/webkit/webkit-guide/css3_multicol.htm | 2 +- examples/webkit/webkit-guide/css3_reflect.htm | 2 +- examples/webkit/webkit-guide/css3_scroll.htm | 2 +- examples/webkit/webkit-guide/css3_sel-nth.htm | 2 +- examples/webkit/webkit-guide/css3_shadow.htm | 2 +- examples/webkit/webkit-guide/css3_text-overflow.htm | 2 +- examples/webkit/webkit-guide/css3_text-shadow.htm | 2 +- examples/webkit/webkit-guide/css3_text-stroke.htm | 2 +- examples/webkit/webkit-guide/form_tapper.htm | 2 +- examples/webkit/webkit-guide/form_toggler.htm | 2 +- examples/webkit/webkit-guide/layout_link-fmt.htm | 2 +- examples/webkit/webkit-guide/layout_tbl-keyhole.htm | 2 +- examples/webkit/webkit-guide/mob_condjs.htm | 2 +- examples/webkit/webkit-guide/mob_layout.htm | 2 +- examples/webkit/webkit-guide/mob_mediaquery.htm | 2 +- examples/webkit/webkit-guide/storage.htm | 2 +- src/xmlpatterns/api/qabstractxmlpullprovider.cpp | 2 +- src/xmlpatterns/api/qabstractxmlpullprovider_p.h | 2 +- src/xmlpatterns/api/qpullbridge.cpp | 2 +- src/xmlpatterns/api/qpullbridge_p.h | 2 +- src/xmlpatterns/api/qxmlschema.cpp | 2 +- src/xmlpatterns/api/qxmlschema.h | 2 +- src/xmlpatterns/api/qxmlschema_p.cpp | 2 +- src/xmlpatterns/api/qxmlschema_p.h | 2 +- src/xmlpatterns/api/qxmlschemavalidator.cpp | 2 +- src/xmlpatterns/api/qxmlschemavalidator.h | 2 +- src/xmlpatterns/api/qxmlschemavalidator_p.h | 2 +- src/xmlpatterns/data/qcomparisonfactory.cpp | 2 +- src/xmlpatterns/data/qcomparisonfactory_p.h | 2 +- src/xmlpatterns/data/qvaluefactory.cpp | 2 +- src/xmlpatterns/data/qvaluefactory_p.h | 2 +- src/xmlpatterns/schema/qnamespacesupport.cpp | 2 +- src/xmlpatterns/schema/qnamespacesupport_p.h | 2 +- src/xmlpatterns/schema/qxsdalternative.cpp | 2 +- src/xmlpatterns/schema/qxsdalternative_p.h | 2 +- src/xmlpatterns/schema/qxsdannotated.cpp | 2 +- src/xmlpatterns/schema/qxsdannotated_p.h | 2 +- src/xmlpatterns/schema/qxsdannotation.cpp | 2 +- src/xmlpatterns/schema/qxsdannotation_p.h | 2 +- src/xmlpatterns/schema/qxsdapplicationinformation.cpp | 2 +- src/xmlpatterns/schema/qxsdapplicationinformation_p.h | 2 +- src/xmlpatterns/schema/qxsdassertion.cpp | 2 +- src/xmlpatterns/schema/qxsdassertion_p.h | 2 +- src/xmlpatterns/schema/qxsdattribute.cpp | 2 +- src/xmlpatterns/schema/qxsdattribute_p.h | 2 +- src/xmlpatterns/schema/qxsdattributegroup.cpp | 2 +- src/xmlpatterns/schema/qxsdattributegroup_p.h | 2 +- src/xmlpatterns/schema/qxsdattributereference.cpp | 2 +- src/xmlpatterns/schema/qxsdattributereference_p.h | 2 +- src/xmlpatterns/schema/qxsdattributeterm.cpp | 2 +- src/xmlpatterns/schema/qxsdattributeterm_p.h | 2 +- src/xmlpatterns/schema/qxsdattributeuse.cpp | 2 +- src/xmlpatterns/schema/qxsdattributeuse_p.h | 2 +- src/xmlpatterns/schema/qxsdcomplextype.cpp | 2 +- src/xmlpatterns/schema/qxsdcomplextype_p.h | 2 +- src/xmlpatterns/schema/qxsddocumentation.cpp | 2 +- src/xmlpatterns/schema/qxsddocumentation_p.h | 2 +- src/xmlpatterns/schema/qxsdelement.cpp | 2 +- src/xmlpatterns/schema/qxsdelement_p.h | 2 +- src/xmlpatterns/schema/qxsdfacet.cpp | 2 +- src/xmlpatterns/schema/qxsdfacet_p.h | 2 +- src/xmlpatterns/schema/qxsdidcache.cpp | 2 +- src/xmlpatterns/schema/qxsdidcache_p.h | 2 +- src/xmlpatterns/schema/qxsdidchelper.cpp | 2 +- src/xmlpatterns/schema/qxsdidchelper_p.h | 2 +- src/xmlpatterns/schema/qxsdidentityconstraint.cpp | 2 +- src/xmlpatterns/schema/qxsdidentityconstraint_p.h | 2 +- src/xmlpatterns/schema/qxsdinstancereader.cpp | 2 +- src/xmlpatterns/schema/qxsdinstancereader_p.h | 2 +- src/xmlpatterns/schema/qxsdmodelgroup.cpp | 2 +- src/xmlpatterns/schema/qxsdmodelgroup_p.h | 2 +- src/xmlpatterns/schema/qxsdnotation.cpp | 2 +- src/xmlpatterns/schema/qxsdnotation_p.h | 2 +- src/xmlpatterns/schema/qxsdparticle.cpp | 2 +- src/xmlpatterns/schema/qxsdparticle_p.h | 2 +- src/xmlpatterns/schema/qxsdparticlechecker.cpp | 2 +- src/xmlpatterns/schema/qxsdparticlechecker_p.h | 2 +- src/xmlpatterns/schema/qxsdreference.cpp | 2 +- src/xmlpatterns/schema/qxsdreference_p.h | 2 +- src/xmlpatterns/schema/qxsdschema.cpp | 2 +- src/xmlpatterns/schema/qxsdschema_p.h | 2 +- src/xmlpatterns/schema/qxsdschemachecker.cpp | 2 +- src/xmlpatterns/schema/qxsdschemachecker_helper.cpp | 2 +- src/xmlpatterns/schema/qxsdschemachecker_p.h | 2 +- src/xmlpatterns/schema/qxsdschemacontext.cpp | 2 +- src/xmlpatterns/schema/qxsdschemacontext_p.h | 2 +- src/xmlpatterns/schema/qxsdschemadebugger.cpp | 2 +- src/xmlpatterns/schema/qxsdschemadebugger_p.h | 2 +- src/xmlpatterns/schema/qxsdschemahelper.cpp | 2 +- src/xmlpatterns/schema/qxsdschemahelper_p.h | 2 +- src/xmlpatterns/schema/qxsdschemamerger.cpp | 2 +- src/xmlpatterns/schema/qxsdschemamerger_p.h | 2 +- src/xmlpatterns/schema/qxsdschemaparser_p.h | 2 +- src/xmlpatterns/schema/qxsdschemaparsercontext.cpp | 2 +- src/xmlpatterns/schema/qxsdschemaparsercontext_p.h | 2 +- src/xmlpatterns/schema/qxsdschemaresolver.cpp | 2 +- src/xmlpatterns/schema/qxsdschemaresolver_p.h | 2 +- src/xmlpatterns/schema/qxsdschematoken.cpp | 2 +- src/xmlpatterns/schema/qxsdschematoken_p.h | 2 +- src/xmlpatterns/schema/qxsdschematypesfactory.cpp | 2 +- src/xmlpatterns/schema/qxsdschematypesfactory_p.h | 2 +- src/xmlpatterns/schema/qxsdsimpletype.cpp | 2 +- src/xmlpatterns/schema/qxsdsimpletype_p.h | 2 +- src/xmlpatterns/schema/qxsdstatemachine.cpp | 2 +- src/xmlpatterns/schema/qxsdstatemachine_p.h | 2 +- src/xmlpatterns/schema/qxsdstatemachinebuilder.cpp | 2 +- src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h | 2 +- src/xmlpatterns/schema/qxsdterm.cpp | 2 +- src/xmlpatterns/schema/qxsdterm_p.h | 2 +- src/xmlpatterns/schema/qxsdtypechecker.cpp | 2 +- src/xmlpatterns/schema/qxsdtypechecker_p.h | 2 +- src/xmlpatterns/schema/qxsduserschematype.cpp | 2 +- src/xmlpatterns/schema/qxsduserschematype_p.h | 2 +- src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel.cpp | 2 +- src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h | 2 +- src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp | 2 +- src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h | 2 +- src/xmlpatterns/schema/qxsdwildcard.cpp | 2 +- src/xmlpatterns/schema/qxsdwildcard_p.h | 2 +- src/xmlpatterns/schema/qxsdxpathexpression.cpp | 2 +- src/xmlpatterns/schema/qxsdxpathexpression_p.h | 2 +- src/xmlpatterns/schema/tokens.xml | 2 +- src/xmlpatterns/type/qnamedschemacomponent.cpp | 2 +- src/xmlpatterns/type/qnamedschemacomponent_p.h | 2 +- tests/auto/selftests/xunit/tst_xunit.cpp | 2 +- tools/assistant/tools/assistant/doc/assistant.qdocconf | 2 +- tools/doxygen/config/footer.html | 2 +- tools/qdoc3/doc/config/qt-html-templates-online.qdocconf | 2 +- tools/qdoc3/doc/config/qt-html-templates.qdocconf | 2 +- tools/qdoc3/test/carbide-eclipse-integration.qdocconf | 2 +- tools/qdoc3/test/jambi.qdocconf | 2 +- tools/qdoc3/test/qt-html-templates-online.qdocconf | 2 +- tools/qdoc3/test/qt-html-templates.qdocconf | 2 +- tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf | 2 +- tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf | 2 +- tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf | 2 +- tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf | 2 +- tools/qdoc3/test/standalone-eclipse-integration.qdocconf | 2 +- util/qlalr/doc/qlalr.qdocconf | 2 +- 164 files changed, 164 insertions(+), 164 deletions(-) diff --git a/config.profiles/symbian/bld.inf b/config.profiles/symbian/bld.inf index 82c4e3c..bfddedc 100644 --- a/config.profiles/symbian/bld.inf +++ b/config.profiles/symbian/bld.inf @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * * Description: Build information file for Qt configuration diff --git a/demos/mobile/guitartuner/src/guitartuner.rc b/demos/mobile/guitartuner/src/guitartuner.rc index b4f7a11..5cd3511 100644 --- a/demos/mobile/guitartuner/src/guitartuner.rc +++ b/demos/mobile/guitartuner/src/guitartuner.rc @@ -11,7 +11,7 @@ BEGIN VALUE "CompanyName", "Nokia Corporation\0" VALUE "FileDescription", "Qt Quick example application.\0" VALUE "FileVersion", "1.2.0\0" - VALUE "LegalCopyright", "Copyright 2011 Nokia Corporation. All rights reserved.\0" + VALUE "LegalCopyright", "Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)." VALUE "ProductName", "Guitar Tuner\0" VALUE "ProductVersion", "1.2.0\0" END diff --git a/examples/webkit/webkit-guide/_copyright.txt b/examples/webkit/webkit-guide/_copyright.txt index e545ac3..a0a5833 100644 --- a/examples/webkit/webkit-guide/_copyright.txt +++ b/examples/webkit/webkit-guide/_copyright.txt @@ -2,7 +2,7 @@ This file is part of _PACKAGE_NAME_ -Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/_image_assets.htm b/examples/webkit/webkit-guide/_image_assets.htm index 5c3f3a0..5640e2c 100644 --- a/examples/webkit/webkit-guide/_image_assets.htm +++ b/examples/webkit/webkit-guide/_image_assets.htm @@ -2,7 +2,7 @@ This file is part of QtWebKit -Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/_index.html b/examples/webkit/webkit-guide/_index.html index 709f951..d702ab5 100644 --- a/examples/webkit/webkit-guide/_index.html +++ b/examples/webkit/webkit-guide/_index.html @@ -282,7 +282,7 @@ entered (localStorage), but credit-card data s/b absent \n" \ "
\n" \ "

\n" \ - " © 2008-2011 Nokia Corporation and/or its\n" \ + " © 2012 Nokia Corporation and/or its\n" \ " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " in Finland and/or other countries worldwide.

\n" \ "

\n" \ diff --git a/tools/qdoc3/doc/config/qt-html-templates.qdocconf b/tools/qdoc3/doc/config/qt-html-templates.qdocconf index e0dc875..705d0aa 100644 --- a/tools/qdoc3/doc/config/qt-html-templates.qdocconf +++ b/tools/qdoc3/doc/config/qt-html-templates.qdocconf @@ -23,7 +23,7 @@ HTML.footer = \ "

\n" \ "
\n" \ "

\n" \ - " © 2008-2011 Nokia Corporation and/or its\n" \ + " © 2012 Nokia Corporation and/or its\n" \ " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " in Finland and/or other countries worldwide.

\n" \ "

\n" \ diff --git a/tools/qdoc3/test/carbide-eclipse-integration.qdocconf b/tools/qdoc3/test/carbide-eclipse-integration.qdocconf index ff50ce6..a9f0677 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 = "


\n" \ "\n" \ - "\n" \ + "\n" \ "\n" \ "\n" \ "
Copyright © 2011 Nokia Corporation and/or its subsidiary(-ies)Copyright © 2012 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Carbide.c++
" diff --git a/tools/qdoc3/test/jambi.qdocconf b/tools/qdoc3/test/jambi.qdocconf index 3f4b42d..b57526c 100644 --- a/tools/qdoc3/test/jambi.qdocconf +++ b/tools/qdoc3/test/jambi.qdocconf @@ -42,7 +42,7 @@ HTML.postheader = "\n" \ "
\n" \ - "\n" \ + "\n" \ "\n" \ "\n" \ "
Copyright © 2011 Nokia Corporation and/or its subsidiary(-ies)Copyright © 2012 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt Jambi \\version
" diff --git a/tools/qdoc3/test/qt-html-templates-online.qdocconf b/tools/qdoc3/test/qt-html-templates-online.qdocconf index 073f1aa..2b6fffe 100644 --- a/tools/qdoc3/test/qt-html-templates-online.qdocconf +++ b/tools/qdoc3/test/qt-html-templates-online.qdocconf @@ -151,7 +151,7 @@ HTML.footer = \ " \n" \ "
\n" \ "

\n" \ - " © 2008-2011 Nokia Corporation and/or its\n" \ + " © 2012 Nokia Corporation and/or its\n" \ " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " in Finland and/or other countries worldwide.

\n" \ "

\n" \ diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 69d00e9..92b54e0 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -23,7 +23,7 @@ HTML.footer = \ "

\n" \ "
\n" \ "

\n" \ - " © 2008-2011 Nokia Corporation and/or its\n" \ + " © 2012 Nokia Corporation and/or its\n" \ " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " in Finland and/or other countries worldwide.

\n" \ "

\n" \ 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 ed94494..2c4b8de 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 = \ "

\n" \ "
\n" \ "

\n" \ - " © 2008-2011 Nokia Corporation and/or its\n" \ + " © 2012 Nokia Corporation and/or its\n" \ " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " in Finland and/or other countries worldwide.

\n" \ "

\n" \ diff --git a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf index 74a4d14..1f87e79 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 = \ "

\n" \ "
\n" \ "

\n" \ - " © 2008-2011 Nokia Corporation and/or its\n" \ + " © 2012 Nokia Corporation and/or its\n" \ " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " in Finland and/or other countries worldwide.

\n" \ "

\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 ec0dc18..027a749 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 = \ "

\n" \ "
\n" \ "

\n" \ - " © 2008-2011 Nokia Corporation and/or its\n" \ + " © 2012 Nokia Corporation and/or its\n" \ " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " in Finland and/or other countries worldwide.

\n" \ "

\n" \ diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf index b4c8f7b..ecf81a4 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 = \ "

\n" \ "
\n" \ "

\n" \ - " © 2008-2011 Nokia Corporation and/or its\n" \ + " © 2012 Nokia Corporation and/or its\n" \ " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " in Finland and/or other countries worldwide.

\n" \ "

\n" \ diff --git a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf index 850a2db..1eb61b7 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 = "


\n" \ "\n" \ - "\n" \ + "\n" \ "\n" \ "\n" \ "
Copyright © 2011 Nokia Corporation and/or its subsidiary(-ies)Copyright © 2012 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt Eclipse Integration 1.5.3
" diff --git a/util/qlalr/doc/qlalr.qdocconf b/util/qlalr/doc/qlalr.qdocconf index f5af331..f2033e1 100644 --- a/util/qlalr/doc/qlalr.qdocconf +++ b/util/qlalr/doc/qlalr.qdocconf @@ -59,7 +59,7 @@ HTML.postheader = "\n" \ "
\n" \ - "\n" \ + "\n" \ "\n" \ "\n" \ "
Copyright © 2011 Nokia Corporation and/or its subsidiary(-ies)Copyright © 2012 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt \\version
" -- cgit v0.12