diff options
Diffstat (limited to 'doc')
97 files changed, 97 insertions, 145 deletions
diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc index 2a6fd2c3aa..55d0868b20 100644 --- 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 ** diff --git a/doc/api/coding-style.qdoc b/doc/api/coding-style.qdoc index 0f6673b5a2..619c1a04a9 100644 --- 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 ** diff --git a/doc/api/qtcreator-api.qdoc b/doc/api/qtcreator-api.qdoc index e3efc3f59a..bf2e14f460 100644 --- 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 ** diff --git a/doc/examples/addressbook-sdk/part1/addressbook.cpp b/doc/examples/addressbook-sdk/part1/addressbook.cpp index 388ace3ad6..c766729cbd 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part1/addressbook.h b/doc/examples/addressbook-sdk/part1/addressbook.h index 4a79b800ab..a420783fbf 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part1/main.cpp b/doc/examples/addressbook-sdk/part1/main.cpp index 8daf663cc4..836ded15ba 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part2/addressbook.cpp b/doc/examples/addressbook-sdk/part2/addressbook.cpp index 7399b93813..56b8033138 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part2/addressbook.h b/doc/examples/addressbook-sdk/part2/addressbook.h index b60c08fc04..f5cc483a11 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part2/main.cpp b/doc/examples/addressbook-sdk/part2/main.cpp index 8daf663cc4..836ded15ba 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part3/addressbook.cpp b/doc/examples/addressbook-sdk/part3/addressbook.cpp index 08e786fd78..456b5c2b04 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part3/addressbook.h b/doc/examples/addressbook-sdk/part3/addressbook.h index 5fdca6539f..1af61122cb 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part3/main.cpp b/doc/examples/addressbook-sdk/part3/main.cpp index f1f7cba051..ff0a0830ff 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part4/addressbook.cpp b/doc/examples/addressbook-sdk/part4/addressbook.cpp index 707946ea3a..b531ac3b48 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part4/addressbook.h b/doc/examples/addressbook-sdk/part4/addressbook.h index 8c6204af33..1c0449f71e 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part4/main.cpp b/doc/examples/addressbook-sdk/part4/main.cpp index f1f7cba051..ff0a0830ff 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part5/addressbook.cpp b/doc/examples/addressbook-sdk/part5/addressbook.cpp index 916f6a153b..8a7dc99d90 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part5/addressbook.h b/doc/examples/addressbook-sdk/part5/addressbook.h index 21b7675012..1c8d66aaaf 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part5/finddialog.cpp b/doc/examples/addressbook-sdk/part5/finddialog.cpp index de8a753cb7..bab39e2c97 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part5/finddialog.h b/doc/examples/addressbook-sdk/part5/finddialog.h index e47b88ae07..14afcc7630 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part5/main.cpp b/doc/examples/addressbook-sdk/part5/main.cpp index f1f7cba051..ff0a0830ff 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part6/addressbook.cpp b/doc/examples/addressbook-sdk/part6/addressbook.cpp index e56caf3538..4c25060608 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part6/addressbook.h b/doc/examples/addressbook-sdk/part6/addressbook.h index 92c0af1a57..84172784ee 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part6/finddialog.cpp b/doc/examples/addressbook-sdk/part6/finddialog.cpp index f73a7eb784..379a1f184a 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part6/finddialog.h b/doc/examples/addressbook-sdk/part6/finddialog.h index 5ea3e51660..3006c99fd7 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part6/main.cpp b/doc/examples/addressbook-sdk/part6/main.cpp index f1f7cba051..ff0a0830ff 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part7/addressbook.cpp b/doc/examples/addressbook-sdk/part7/addressbook.cpp index 980535c52a..25aaf8c51b 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part7/addressbook.h b/doc/examples/addressbook-sdk/part7/addressbook.h index 4ff6937065..d318e5eeff 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part7/finddialog.cpp b/doc/examples/addressbook-sdk/part7/finddialog.cpp index f73a7eb784..379a1f184a 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part7/finddialog.h b/doc/examples/addressbook-sdk/part7/finddialog.h index 5ea3e51660..3006c99fd7 100644 --- 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: ** diff --git a/doc/examples/addressbook-sdk/part7/main.cpp b/doc/examples/addressbook-sdk/part7/main.cpp index f1f7cba051..ff0a0830ff 100644 --- 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: ** diff --git a/doc/examples/batteryindicator/main.cpp b/doc/examples/batteryindicator/main.cpp index 36b4105d27..01f76f732b 100644 --- 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. ** diff --git a/doc/examples/batteryindicator/mainwindow.cpp b/doc/examples/batteryindicator/mainwindow.cpp index 232ef64694..15af3e375f 100644 --- 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. ** diff --git a/doc/examples/batteryindicator/mainwindow.h b/doc/examples/batteryindicator/mainwindow.h index a812ef8435..efe67bffb9 100644 --- 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. ** diff --git a/doc/examples/doc_src_plugins.qdoc b/doc/examples/doc_src_plugins.qdoc index bf526f0bdf..3559130940 100644 --- 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 ** diff --git a/doc/examples/textfinder/main.cpp b/doc/examples/textfinder/main.cpp index 8b43bc4fb2..d68cc009e7 100644 --- 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: ** diff --git a/doc/examples/textfinder/textfinder.cpp b/doc/examples/textfinder/textfinder.cpp index 8cbda87019..92aca020a8 100644 --- 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: ** diff --git a/doc/examples/textfinder/textfinder.h b/doc/examples/textfinder/textfinder.h index 5f1e6e64f4..2ea85706ad 100644 --- 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: ** diff --git a/doc/maemodev.qdoc b/doc/maemodev.qdoc index 391082272b..66ff47c4e6 100644 --- 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 ** diff --git a/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.cpp b/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.cpp index ade9700370..d63c0fd6d4 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.h b/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.h index 1489b1ba00..7de19e68c3 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.cpp b/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.cpp index 688f25173f..b9cc3c032d 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.h b/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.h index 2a0e52e72a..845ec5fe09 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.cpp b/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.cpp index 463fa77860..ebadf91dd2 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.h b/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.h index d40bef7848..da0856c347 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/donothing/donothingplugin.cpp b/doc/pluginhowto/examples/donothing/donothingplugin.cpp index 11d4892ff2..9141cc35ce 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/donothing/donothingplugin.h b/doc/pluginhowto/examples/donothing/donothingplugin.h index 73fc0f9f99..cfb7443c31 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/headerfilter/headerfilter.cpp b/doc/pluginhowto/examples/headerfilter/headerfilter.cpp index fac2037c30..5ce16e53df 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/headerfilter/headerfilter.h b/doc/pluginhowto/examples/headerfilter/headerfilter.h index 483f70a5d6..ebe3127f04 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/headerfilter/headerfilterplugin.cpp b/doc/pluginhowto/examples/headerfilter/headerfilterplugin.cpp index 03a362cceb..a863f0ce39 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/headerfilter/headerfilterplugin.h b/doc/pluginhowto/examples/headerfilter/headerfilterplugin.h index db2d2313de..19a82b3a8b 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/htmleditor/htmleditor.cpp b/doc/pluginhowto/examples/htmleditor/htmleditor.cpp index 78d4f33a1c..eee20e2d51 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/htmleditor/htmleditor.h b/doc/pluginhowto/examples/htmleditor/htmleditor.h index f3c0d801d0..89090943ab 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/htmleditor/htmleditorfactory.cpp b/doc/pluginhowto/examples/htmleditor/htmleditorfactory.cpp index 2f6644730a..b87c42bd5c 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/htmleditor/htmleditorfactory.h b/doc/pluginhowto/examples/htmleditor/htmleditorfactory.h index 6b6580df8e..953247e120 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/htmleditor/htmleditorplugin.cpp b/doc/pluginhowto/examples/htmleditor/htmleditorplugin.cpp index a3c3422728..d6f9585477 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/htmleditor/htmleditorplugin.h b/doc/pluginhowto/examples/htmleditor/htmleditorplugin.h index 6604665ec3..7c9f349dff 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/htmleditor/htmleditorwidget.cpp b/doc/pluginhowto/examples/htmleditor/htmleditorwidget.cpp index a2a9451363..8f24db866c 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/htmleditor/htmleditorwidget.h b/doc/pluginhowto/examples/htmleditor/htmleditorwidget.h index 9318d2bba4..a09a131294 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/htmleditor/htmlfile.cpp b/doc/pluginhowto/examples/htmleditor/htmlfile.cpp index ca1c5eba61..fba4500d22 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/htmleditor/htmlfile.h b/doc/pluginhowto/examples/htmleditor/htmlfile.h index 87a067399a..e021d038e4 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/loggermode/loggermode.cpp b/doc/pluginhowto/examples/loggermode/loggermode.cpp index bf1b15bb7c..f43339353d 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/loggermode/loggermode.h b/doc/pluginhowto/examples/loggermode/loggermode.h index 09013b3c22..d9ee4249ed 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/loggermode/loggermodePlugin.cpp b/doc/pluginhowto/examples/loggermode/loggermodePlugin.cpp index 46c7feac14..de157687de 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/loggermode/loggermodePlugin.h b/doc/pluginhowto/examples/loggermode/loggermodePlugin.h index 0d742ea126..2a22839f45 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/loggermode/loggermodewidget.cpp b/doc/pluginhowto/examples/loggermode/loggermodewidget.cpp index 844629b978..def52933f1 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/loggermode/loggermodewidget.h b/doc/pluginhowto/examples/loggermode/loggermodewidget.h index 37841e4a69..81edc05a97 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.cpp b/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.cpp index e46070c724..e1a029865d 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.h b/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.h index 9a722a61e0..0c8944d674 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.cpp b/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.cpp index 53afb2ccc0..526b7cd5c5 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.h b/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.h index 73fc0f9f99..cfb7443c31 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.cpp b/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.cpp index 0ed53c6985..b3d22f42fb 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.h b/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.h index 73fc0f9f99..cfb7443c31 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.cpp b/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.cpp index d34ecf676f..77ea0367c4 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.h b/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.h index 9a722a61e0..0c8944d674 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/preferencepane/modifiedfilelister.cpp b/doc/pluginhowto/examples/preferencepane/modifiedfilelister.cpp index d576e3d286..2d45476e30 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/preferencepane/modifiedfilelister.h b/doc/pluginhowto/examples/preferencepane/modifiedfilelister.h index 8130341532..6a89e0495f 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.cpp b/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.cpp index 599be2377b..1cddc65696 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.h b/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.h index 4aa2872b08..0a3be980db 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.cpp b/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.cpp index 8a66cec910..0eec536e57 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.h b/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.h index 9d664a3a50..cb81093a32 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/progressbar/headerfilteprogress.cpp b/doc/pluginhowto/examples/progressbar/headerfilteprogress.cpp index 0670749c69..61a8931026 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/progressbar/headerfilterprogress.h b/doc/pluginhowto/examples/progressbar/headerfilterprogress.h index 10e35dd00d..acaaf28525 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/progressbar/progressbarplugin.cpp b/doc/pluginhowto/examples/progressbar/progressbarplugin.cpp index f47dd6e34e..a4a402e681 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/progressbar/progressbarplugin.h b/doc/pluginhowto/examples/progressbar/progressbarplugin.h index f19e2b8db7..4c4665fe6a 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.cpp b/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.cpp index 4e6acbc837..0a513ad854 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.h b/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.h index 7db6cd7d20..bed7f78213 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.cpp b/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.cpp index 35a363adf6..f8ff70cee4 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.h b/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.h index 34966dac6a..cc2c9862ce 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.cpp b/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.cpp index 1d34ee9e19..287ab8427d 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.h b/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.h index d55d3aec68..b61f275d5c 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.cpp b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.cpp index 9a01f2a884..fc10d70a33 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.h b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.h index 777a5d875e..20ee81e710 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.cpp b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.cpp index 2e0d368579..7ea0391de9 100644 --- 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. ** diff --git a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.h b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.h index 7bd9f6d537..8ba3d70da2 100644 --- 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. ** diff --git a/doc/qtcreator-faq.qdoc b/doc/qtcreator-faq.qdoc index e5a6b711bb..1c708d8073 100644 --- 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 ** diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 1479cb39df..68fc10cb2f 100644 --- 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 ** diff --git a/doc/symbiandev.qdoc b/doc/symbiandev.qdoc index 3cff0df6e3..b509a03c97 100644 --- 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 ** |