Update license.

2011-04-13 08:42:33 +02:00
parent 61790e54e8
commit 8397663964
3335 changed files with 42790 additions and 46830 deletions
--- a/2
+++ b/2
@@ -277,7 +277,7 @@ we thank the authors who made this possible:
  All rights reserved.
  Copyright (c) 2010 Denis Mingulov.

-  Contact: Nokia Corporation (qt-info@nokia.com)
+  Contact: Nokia Corporation (info@qt.nokia.com)

  This file is part of Qt Creator.

--- a/doc/addressbook-sdk.qdoc
+++ b/doc/addressbook-sdk.qdoc
@@ -4,14 +4,8 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** No Commercial Usage
-**
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
 **
 ** GNU Free Documentation License
 **
--- a/doc/api/coding-style.qdoc
+++ b/doc/api/coding-style.qdoc
@@ -4,14 +4,8 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** No Commercial Usage
-**
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
 **
 ** GNU Free Documentation License
 **
--- a/doc/api/qtcreator-api.qdoc
+++ b/doc/api/qtcreator-api.qdoc
@@ -4,14 +4,8 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** No Commercial Usage
-**
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
 **
 ** GNU Free Documentation License
 **
--- a/doc/examples/addressbook-sdk/part1/addressbook.cpp
+++ b/doc/examples/addressbook-sdk/part1/addressbook.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part1/addressbook.h
+++ b/doc/examples/addressbook-sdk/part1/addressbook.h
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part1/main.cpp
+++ b/doc/examples/addressbook-sdk/part1/main.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part2/addressbook.cpp
+++ b/doc/examples/addressbook-sdk/part2/addressbook.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part2/addressbook.h
+++ b/doc/examples/addressbook-sdk/part2/addressbook.h
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part2/main.cpp
+++ b/doc/examples/addressbook-sdk/part2/main.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part3/addressbook.cpp
+++ b/doc/examples/addressbook-sdk/part3/addressbook.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part3/addressbook.h
+++ b/doc/examples/addressbook-sdk/part3/addressbook.h
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part3/main.cpp
+++ b/doc/examples/addressbook-sdk/part3/main.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part4/addressbook.cpp
+++ b/doc/examples/addressbook-sdk/part4/addressbook.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part4/addressbook.h
+++ b/doc/examples/addressbook-sdk/part4/addressbook.h
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part4/main.cpp
+++ b/doc/examples/addressbook-sdk/part4/main.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part5/addressbook.cpp
+++ b/doc/examples/addressbook-sdk/part5/addressbook.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part5/addressbook.h
+++ b/doc/examples/addressbook-sdk/part5/addressbook.h
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part5/finddialog.cpp
+++ b/doc/examples/addressbook-sdk/part5/finddialog.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part5/finddialog.h
+++ b/doc/examples/addressbook-sdk/part5/finddialog.h
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part5/main.cpp
+++ b/doc/examples/addressbook-sdk/part5/main.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part6/addressbook.cpp
+++ b/doc/examples/addressbook-sdk/part6/addressbook.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part6/addressbook.h
+++ b/doc/examples/addressbook-sdk/part6/addressbook.h
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part6/finddialog.cpp
+++ b/doc/examples/addressbook-sdk/part6/finddialog.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part6/finddialog.h
+++ b/doc/examples/addressbook-sdk/part6/finddialog.h
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part6/main.cpp
+++ b/doc/examples/addressbook-sdk/part6/main.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part7/addressbook.cpp
+++ b/doc/examples/addressbook-sdk/part7/addressbook.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part7/addressbook.h
+++ b/doc/examples/addressbook-sdk/part7/addressbook.h
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part7/finddialog.cpp
+++ b/doc/examples/addressbook-sdk/part7/finddialog.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part7/finddialog.h
+++ b/doc/examples/addressbook-sdk/part7/finddialog.h
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/addressbook-sdk/part7/main.cpp
+++ b/doc/examples/addressbook-sdk/part7/main.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/batteryindicator/main.cpp
+++ b/doc/examples/batteryindicator/main.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/examples/batteryindicator/mainwindow.cpp
+++ b/doc/examples/batteryindicator/mainwindow.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/examples/batteryindicator/mainwindow.h
+++ b/doc/examples/batteryindicator/mainwindow.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/examples/doc_src_plugins.qdoc
+++ b/doc/examples/doc_src_plugins.qdoc
@@ -4,14 +4,8 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** No Commercial Usage
-**
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
 **
 ** GNU Free Documentation License
 **
--- a/doc/examples/textfinder/main.cpp
+++ b/doc/examples/textfinder/main.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/textfinder/textfinder.cpp
+++ b/doc/examples/textfinder/textfinder.cpp
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/examples/textfinder/textfinder.h
+++ b/doc/examples/textfinder/textfinder.h
@@ -4,7 +4,7 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
--- a/doc/maemodev.qdoc
+++ b/doc/maemodev.qdoc
@@ -4,14 +4,8 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** No Commercial Usage
-**
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
 **
 ** GNU Free Documentation License
 **
--- a/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.cpp
+++ b/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.h
+++ b/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.cpp
+++ b/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.h
+++ b/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.cpp
+++ b/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.h
+++ b/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/donothing/donothingplugin.cpp
+++ b/doc/pluginhowto/examples/donothing/donothingplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/donothing/donothingplugin.h
+++ b/doc/pluginhowto/examples/donothing/donothingplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/headerfilter/headerfilter.cpp
+++ b/doc/pluginhowto/examples/headerfilter/headerfilter.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/headerfilter/headerfilter.h
+++ b/doc/pluginhowto/examples/headerfilter/headerfilter.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/headerfilter/headerfilterplugin.cpp
+++ b/doc/pluginhowto/examples/headerfilter/headerfilterplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/headerfilter/headerfilterplugin.h
+++ b/doc/pluginhowto/examples/headerfilter/headerfilterplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/htmleditor/htmleditor.cpp
+++ b/doc/pluginhowto/examples/htmleditor/htmleditor.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/htmleditor/htmleditor.h
+++ b/doc/pluginhowto/examples/htmleditor/htmleditor.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/htmleditor/htmleditorfactory.cpp
+++ b/doc/pluginhowto/examples/htmleditor/htmleditorfactory.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/htmleditor/htmleditorfactory.h
+++ b/doc/pluginhowto/examples/htmleditor/htmleditorfactory.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/htmleditor/htmleditorplugin.cpp
+++ b/doc/pluginhowto/examples/htmleditor/htmleditorplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/htmleditor/htmleditorplugin.h
+++ b/doc/pluginhowto/examples/htmleditor/htmleditorplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/htmleditor/htmleditorwidget.cpp
+++ b/doc/pluginhowto/examples/htmleditor/htmleditorwidget.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/htmleditor/htmleditorwidget.h
+++ b/doc/pluginhowto/examples/htmleditor/htmleditorwidget.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/htmleditor/htmlfile.cpp
+++ b/doc/pluginhowto/examples/htmleditor/htmlfile.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/htmleditor/htmlfile.h
+++ b/doc/pluginhowto/examples/htmleditor/htmlfile.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/loggermode/loggermode.cpp
+++ b/doc/pluginhowto/examples/loggermode/loggermode.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/loggermode/loggermode.h
+++ b/doc/pluginhowto/examples/loggermode/loggermode.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/loggermode/loggermodePlugin.cpp
+++ b/doc/pluginhowto/examples/loggermode/loggermodePlugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/loggermode/loggermodePlugin.h
+++ b/doc/pluginhowto/examples/loggermode/loggermodePlugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/loggermode/loggermodewidget.cpp
+++ b/doc/pluginhowto/examples/loggermode/loggermodewidget.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/loggermode/loggermodewidget.h
+++ b/doc/pluginhowto/examples/loggermode/loggermodewidget.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.cpp
+++ b/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.h
+++ b/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.cpp
+++ b/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.h
+++ b/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.cpp
+++ b/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.h
+++ b/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.cpp
+++ b/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.h
+++ b/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/preferencepane/modifiedfilelister.cpp
+++ b/doc/pluginhowto/examples/preferencepane/modifiedfilelister.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/preferencepane/modifiedfilelister.h
+++ b/doc/pluginhowto/examples/preferencepane/modifiedfilelister.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.cpp
+++ b/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.h
+++ b/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.cpp
+++ b/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.h
+++ b/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/progressbar/headerfilteprogress.cpp
+++ b/doc/pluginhowto/examples/progressbar/headerfilteprogress.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/progressbar/headerfilterprogress.h
+++ b/doc/pluginhowto/examples/progressbar/headerfilterprogress.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/progressbar/progressbarplugin.cpp
+++ b/doc/pluginhowto/examples/progressbar/progressbarplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/progressbar/progressbarplugin.h
+++ b/doc/pluginhowto/examples/progressbar/progressbarplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.cpp
+++ b/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.h
+++ b/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.cpp
+++ b/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.h
+++ b/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.cpp
+++ b/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.h
+++ b/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.cpp
+++ b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.h
+++ b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.cpp
+++ b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.h
+++ b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
--- a/doc/qtcreator-faq.qdoc
+++ b/doc/qtcreator-faq.qdoc
@@ -4,14 +4,8 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** No Commercial Usage
-**
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
 **
 ** GNU Free Documentation License
 **
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -4,14 +4,8 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** No Commercial Usage
-**
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
 **
 ** GNU Free Documentation License
 **
--- a/doc/symbiandev.qdoc
+++ b/doc/symbiandev.qdoc
@@ -4,14 +4,8 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** No Commercial Usage
-**
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
 **
 ** GNU Free Documentation License
 **
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -4,28 +4,27 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** No Commercial Usage
-**
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
 **
 ** GNU Lesser General Public License Usage
 **
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
 **
--- a/share/qtcreator/gdbmacros/gdbmacros.h
+++ b/share/qtcreator/gdbmacros/gdbmacros.h
@@ -4,28 +4,27 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** No Commercial Usage
-**
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
 **
 ** GNU Lesser General Public License Usage
 **
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
 **
--- a/Show More
+++ b/Show More