diff options
author | hjk <qtc-committer@nokia.com> | 2011-07-05 18:26:01 +0200 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2011-07-06 11:14:01 +0200 |
commit | a322bd606fa966a011896a1db36e240d27c1d60f (patch) | |
tree | 79b3974fb5ae7ac6c85d8d713940f4bc8480f56d | |
parent | 78b1b042e3ef361a81331b2f1ea289fe674c03c0 (diff) |
Replace qt-info@nokia.com with info@qt.nokia.com
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
364 files changed, 403 insertions, 403 deletions
diff --git a/doc/api/coding-style.qdoc b/doc/api/coding-style.qdoc index 82e07312d0..40a2bdec3a 100644 --- a/doc/api/coding-style.qdoc +++ b/doc/api/coding-style.qdoc @@ -15,7 +15,7 @@ ** file. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/doc/api/external-tool-spec.qdoc b/doc/api/external-tool-spec.qdoc index 8e6362a9a9..8706a6c916 100644 --- a/doc/api/external-tool-spec.qdoc +++ b/doc/api/external-tool-spec.qdoc @@ -15,7 +15,7 @@ ** file. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/doc/api/qtcreator-dev-wizards.qdoc b/doc/api/qtcreator-dev-wizards.qdoc index 30bbf22751..fdf122cc7e 100644 --- a/doc/api/qtcreator-dev-wizards.qdoc +++ b/doc/api/qtcreator-dev-wizards.qdoc @@ -15,7 +15,7 @@ ** file. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/doc/api/qtcreator-dev.qdoc b/doc/api/qtcreator-dev.qdoc index 864dfd9104..38379ab01b 100644 --- a/doc/api/qtcreator-dev.qdoc +++ b/doc/api/qtcreator-dev.qdoc @@ -15,7 +15,7 @@ ** file. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/doc/api/qtcreator-ui-text.qdoc b/doc/api/qtcreator-ui-text.qdoc index ccb8334b6c..65074d0317 100644 --- a/doc/api/qtcreator-ui-text.qdoc +++ b/doc/api/qtcreator-ui-text.qdoc @@ -15,7 +15,7 @@ ** file. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/doc/examples/doc_src_plugins.qdoc b/doc/examples/doc_src_plugins.qdoc index 3559130940..ef4a938b95 100644 --- a/doc/examples/doc_src_plugins.qdoc +++ b/doc/examples/doc_src_plugins.qdoc @@ -15,7 +15,7 @@ ** file. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/doc/maemodev.qdoc b/doc/maemodev.qdoc index e6c92d2e2e..c7ef5739fa 100644 --- a/doc/maemodev.qdoc +++ b/doc/maemodev.qdoc @@ -15,7 +15,7 @@ ** file. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/doc/qtcreator-faq.qdoc b/doc/qtcreator-faq.qdoc index d212cde60b..7522611370 100644 --- a/doc/qtcreator-faq.qdoc +++ b/doc/qtcreator-faq.qdoc @@ -15,7 +15,7 @@ ** file. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/doc/symbiandev.qdoc b/doc/symbiandev.qdoc index 43a2ca7ae9..dbe2a956d1 100644 --- a/doc/symbiandev.qdoc +++ b/doc/symbiandev.qdoc @@ -15,7 +15,7 @@ ** file. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/share/qtcreator/dumper/dumper.h b/share/qtcreator/dumper/dumper.h index 644c9b9201..3a0bda0d85 100644 --- a/share/qtcreator/dumper/dumper.h +++ b/share/qtcreator/dumper/dumper.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/dumper/dumper_p.h b/share/qtcreator/dumper/dumper_p.h index 35b24edbff..b1b1ad53ca 100644 --- a/share/qtcreator/dumper/dumper_p.h +++ b/share/qtcreator/dumper/dumper_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/dumper/test/main.cpp b/share/qtcreator/dumper/test/main.cpp index 00eb317c2c..fc1b3e8a20 100644 --- a/share/qtcreator/dumper/test/main.cpp +++ b/share/qtcreator/dumper/test/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/glsl/glsl_120.frag b/share/qtcreator/glsl/glsl_120.frag index 93fa2678f6..6cbf1e7156 100644 --- a/share/qtcreator/glsl/glsl_120.frag +++ b/share/qtcreator/glsl/glsl_120.frag @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/glsl/glsl_120.vert b/share/qtcreator/glsl/glsl_120.vert index af1af6c8c4..ba307db913 100644 --- a/share/qtcreator/glsl/glsl_120.vert +++ b/share/qtcreator/glsl/glsl_120.vert @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/glsl/glsl_120_common.glsl b/share/qtcreator/glsl/glsl_120_common.glsl index 297d104888..387afcc25c 100644 --- a/share/qtcreator/glsl/glsl_120_common.glsl +++ b/share/qtcreator/glsl/glsl_120_common.glsl @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/glsl/glsl_es_100.frag b/share/qtcreator/glsl/glsl_es_100.frag index e499ff7245..55393153ba 100644 --- a/share/qtcreator/glsl/glsl_es_100.frag +++ b/share/qtcreator/glsl/glsl_es_100.frag @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/glsl/glsl_es_100.vert b/share/qtcreator/glsl/glsl_es_100.vert index ff2d532538..094e78df1d 100644 --- a/share/qtcreator/glsl/glsl_es_100.vert +++ b/share/qtcreator/glsl/glsl_es_100.vert @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/glsl/glsl_es_100_common.glsl b/share/qtcreator/glsl/glsl_es_100_common.glsl index 1dd90c07ed..0551a38d6b 100644 --- a/share/qtcreator/glsl/glsl_es_100_common.glsl +++ b/share/qtcreator/glsl/glsl_es_100_common.glsl @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmldump/main.cpp b/share/qtcreator/qml/qmldump/main.cpp index ef3f728c26..a018e6e07e 100644 --- a/share/qtcreator/qml/qmldump/main.cpp +++ b/share/qtcreator/qml/qmldump/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmldump/qmlstreamwriter.cpp b/share/qtcreator/qml/qmldump/qmlstreamwriter.cpp index a7105f65bc..2e2726b6f0 100644 --- a/share/qtcreator/qml/qmldump/qmlstreamwriter.cpp +++ b/share/qtcreator/qml/qmldump/qmlstreamwriter.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmldump/qmlstreamwriter.h b/share/qtcreator/qml/qmldump/qmlstreamwriter.h index 1a447d7de6..95c409d9a8 100644 --- a/share/qtcreator/qml/qmldump/qmlstreamwriter.h +++ b/share/qtcreator/qml/qmldump/qmlstreamwriter.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.cpp index 58afa5a9e2..b6d6819c7e 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h b/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h index 8fbfc9af47..95a76c94cd 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp index 9580d0d131..013d28bbec 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h index 3bb8ef7fd8..991c9fa913 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp index 2ccc2a79d8..1612991d36 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h b/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h index d176dde093..5898ab0f79 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.cpp b/share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.cpp index 5a8b8e1020..093d9f0a9b 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.h b/share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.h index d5fe730a4c..15a476e08e 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.cpp b/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.cpp index b7a8ade5d3..3ac067e147 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h b/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h index 052284a409..321d47e060 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.cpp b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.cpp index fb11850745..7654d43bea 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.h b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.h index 78df3cff4b..2f75df3a4f 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.cpp b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.cpp index 98605e627b..194aa61d9a 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.h b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.h index 1b179e62ce..8b33ab2020 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp index f9b8902132..042b4c3bbe 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h index 4f843e4477..0b44225125 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.cpp b/share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.cpp index bdf8abcb27..dc3c832449 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.h b/share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.h index 2850e624ed..fa4ef94243 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp b/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp index 02ec9d1b06..3b448b1a0b 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h b/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h index b1bf62f9e9..01ea8c4c43 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp b/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp index 33674c0efe..73fca72661 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h b/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h index 02c56a3b19..c9b0d95a9f 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp b/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp index 76c7df7391..a6a6c1bc3a 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h b/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h index 26029bb46f..0db223a7c2 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp index a2683092b0..c15cd6189d 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.h b/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.h index 7eb35bdaef..8d25d86c7b 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h b/share/qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h index ba7b3a92a2..af2a4806c2 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h +++ b/share/qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeinspectorservice.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeinspectorservice.h index c28f0b50ba..9c4f74c8f5 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeinspectorservice.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeinspectorservice.h @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h index 6ba0427187..134d642ccb 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h index 7621a9e8d7..e5af0328f8 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/include/qmlinspectorconstants.h b/share/qtcreator/qml/qmljsdebugger/include/qmlinspectorconstants.h index eb5ac317e8..a777a4abaa 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qmlinspectorconstants.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qmlinspectorconstants.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h b/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h index 19f65f7d74..bb364aa5ef 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h index a883d96265..ae53ea65d2 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h index e3771b735e..3ae834a39c 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h index b864fc0446..58e064238b 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp b/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp index 958012d92e..770f531348 100644 --- a/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp +++ b/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeinspectorservice.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeinspectorservice.cpp index b3c94ec6b0..b55628ab22 100644 --- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeinspectorservice.cpp +++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeinspectorservice.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp index 946d3f2d8b..235a359291 100644 --- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp +++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector_p.h b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector_p.h index ed2e007cc2..356e39f29b 100644 --- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector_p.h +++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/Info.plist.in b/share/qtcreator/qml/qmlobserver/Info.plist.in index d8900989ae..5ca16668c0 100644 --- a/share/qtcreator/qml/qmlobserver/Info.plist.in +++ b/share/qtcreator/qml/qmlobserver/Info.plist.in @@ -28,7 +28,7 @@ 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.</string> +Nokia at info@qt.nokia.com.</string> <key>CFBundleIconFile</key> <string>@ICON@</string> <key>CFBundleIdentifier</key> diff --git a/share/qtcreator/qml/qmlobserver/browser/Browser.qml b/share/qtcreator/qml/qmlobserver/browser/Browser.qml index 295d049bec..98e8374ebd 100644 --- a/share/qtcreator/qml/qmlobserver/browser/Browser.qml +++ b/share/qtcreator/qml/qmlobserver/browser/Browser.qml @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/deviceorientation.cpp b/share/qtcreator/qml/qmlobserver/deviceorientation.cpp index f172869440..6d2cf2be74 100644 --- a/share/qtcreator/qml/qmlobserver/deviceorientation.cpp +++ b/share/qtcreator/qml/qmlobserver/deviceorientation.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/deviceorientation.h b/share/qtcreator/qml/qmlobserver/deviceorientation.h index 21ed9702b4..45e5c020fb 100644 --- a/share/qtcreator/qml/qmlobserver/deviceorientation.h +++ b/share/qtcreator/qml/qmlobserver/deviceorientation.h @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/deviceorientation_harmattan.cpp b/share/qtcreator/qml/qmlobserver/deviceorientation_harmattan.cpp index ecf15ac091..34eb4cff95 100644 --- a/share/qtcreator/qml/qmlobserver/deviceorientation_harmattan.cpp +++ b/share/qtcreator/qml/qmlobserver/deviceorientation_harmattan.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/deviceorientation_maemo5.cpp b/share/qtcreator/qml/qmlobserver/deviceorientation_maemo5.cpp index 58411af93c..e9241f4675 100644 --- a/share/qtcreator/qml/qmlobserver/deviceorientation_maemo5.cpp +++ b/share/qtcreator/qml/qmlobserver/deviceorientation_maemo5.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/deviceorientation_symbian.cpp b/share/qtcreator/qml/qmlobserver/deviceorientation_symbian.cpp index 82af51dab1..84c3a2257b 100644 --- a/share/qtcreator/qml/qmlobserver/deviceorientation_symbian.cpp +++ b/share/qtcreator/qml/qmlobserver/deviceorientation_symbian.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/loggerwidget.cpp b/share/qtcreator/qml/qmlobserver/loggerwidget.cpp index 9718cad81d..f924949a3b 100644 --- a/share/qtcreator/qml/qmlobserver/loggerwidget.cpp +++ b/share/qtcreator/qml/qmlobserver/loggerwidget.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/loggerwidget.h b/share/qtcreator/qml/qmlobserver/loggerwidget.h index 382a41972f..c0a662413e 100644 --- a/share/qtcreator/qml/qmlobserver/loggerwidget.h +++ b/share/qtcreator/qml/qmlobserver/loggerwidget.h @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/main.cpp b/share/qtcreator/qml/qmlobserver/main.cpp index d678e816c3..e8291d2f5d 100644 --- a/share/qtcreator/qml/qmlobserver/main.cpp +++ b/share/qtcreator/qml/qmlobserver/main.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/proxysettings.cpp b/share/qtcreator/qml/qmlobserver/proxysettings.cpp index 67ffd912c3..2a94047c29 100644 --- a/share/qtcreator/qml/qmlobserver/proxysettings.cpp +++ b/share/qtcreator/qml/qmlobserver/proxysettings.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/proxysettings.h b/share/qtcreator/qml/qmlobserver/proxysettings.h index fbbc945bce..462f06d8e1 100644 --- a/share/qtcreator/qml/qmlobserver/proxysettings.h +++ b/share/qtcreator/qml/qmlobserver/proxysettings.h @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp b/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp index aeb57d2a22..b51563d844 100644 --- a/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp +++ b/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/qdeclarativetester.h b/share/qtcreator/qml/qmlobserver/qdeclarativetester.h index d302fe749f..399b031c9b 100644 --- a/share/qtcreator/qml/qmlobserver/qdeclarativetester.h +++ b/share/qtcreator/qml/qmlobserver/qdeclarativetester.h @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp index ae2a34a578..a676a6fd14 100644 --- a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp +++ b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/qmlruntime.h b/share/qtcreator/qml/qmlobserver/qmlruntime.h index 24e9ce76ca..02f8bd6a96 100644 --- a/share/qtcreator/qml/qmlobserver/qmlruntime.h +++ b/share/qtcreator/qml/qmlobserver/qmlruntime.h @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/startup/Logo.qml b/share/qtcreator/qml/qmlobserver/startup/Logo.qml index 99944581b9..a82d0b86f9 100644 --- a/share/qtcreator/qml/qmlobserver/startup/Logo.qml +++ b/share/qtcreator/qml/qmlobserver/startup/Logo.qml @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/startup/startup.qml b/share/qtcreator/qml/qmlobserver/startup/startup.qml index b3ba87c66a..ab4a8311a1 100644 --- a/share/qtcreator/qml/qmlobserver/startup/startup.qml +++ b/share/qtcreator/qml/qmlobserver/startup/startup.qml @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlobserver/texteditautoresizer_maemo5.h b/share/qtcreator/qml/qmlobserver/texteditautoresizer_maemo5.h index d492f5d758..cf51ea68fb 100644 --- a/share/qtcreator/qml/qmlobserver/texteditautoresizer_maemo5.h +++ b/share/qtcreator/qml/qmlobserver/texteditautoresizer_maemo5.h @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp index c6c4658e34..32e4ce1361 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp +++ b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** ** No Commercial Usage ** @@ -27,7 +27,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h index 47e6f927f6..5a8acad675 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** ** No Commercial Usage ** @@ -27,7 +27,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp index 65b427c21e..4655c5e68c 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp +++ b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h index 9a04e4811f..920cc55452 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp index 1e8cd6bdf3..e316198b50 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h index c0c078fc47..f7e33530e1 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp index b66784a9a5..ca2a3f0226 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h index 2739bddbc9..c666777101 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp index a97b2202ec..2733050759 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h index 4faa447eee..7f252b742a 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp index e432ba32fa..1a1e7fd2cc 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h index bf60721274..3317088233 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp index e25c0ce3b1..a6167ef82f 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h index 78aae47692..8c96c9d8b4 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp index acd46e7c16..546a5a9480 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h index eabd778009..8951f9227a 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp index 14cfabb1bc..1bf75ddb38 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.h index ea5aa990e9..51b904f02a 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.h @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.cpp index 91fe2417c0..55542ca4ba 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.cpp @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.h index 4722a2df23..99b1c25186 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.h +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.h @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp index 802fd403c1..55df8bc0a6 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.h index 60c41f2780..54673c9bf9 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.h @@ -10,7 +10,7 @@ ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** @@ -56,7 +56,7 @@ ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** diff --git a/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml b/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml index 3317e0abbd..5fee3deb6f 100644 --- a/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml +++ b/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml @@ -28,7 +28,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml b/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml index a8c0afa8c9..a7011dfcc0 100644 --- a/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml +++ b/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml @@ -28,7 +28,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/templates/wizards/qml-extension/wizard.xml b/share/qtcreator/templates/wizards/qml-extension/wizard.xml index 49a3dbdf5c..7ea0ac80c3 100644 --- a/share/qtcreator/templates/wizards/qml-extension/wizard.xml +++ b/share/qtcreator/templates/wizards/qml-extension/wizard.xml @@ -28,7 +28,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml index 5f5bb94be3..05a6c3096b 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml @@ -28,7 +28,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/templates/wizards/scriptgeneratedproject/wizard_sample.xml b/share/qtcreator/templates/wizards/scriptgeneratedproject/wizard_sample.xml index ce32b53810..3718a346e9 100644 --- a/share/qtcreator/templates/wizards/scriptgeneratedproject/wizard_sample.xml +++ b/share/qtcreator/templates/wizards/scriptgeneratedproject/wizard_sample.xml @@ -28,7 +28,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/share/qtcreator/translations/check-ts.pl b/share/qtcreator/translations/check-ts.pl index 5b126d3bf2..1bf79d5452 100755 --- a/share/qtcreator/translations/check-ts.pl +++ b/share/qtcreator/translations/check-ts.pl @@ -26,7 +26,7 @@ ## 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. +## Nokia at info@qt.nokia.com. ## ## ## diff --git a/share/qtcreator/welcomescreen/components/custom/Slider.qml b/share/qtcreator/welcomescreen/components/custom/Slider.qml index f551baa85a..5bb78f69fd 100644 --- a/share/qtcreator/welcomescreen/components/custom/Slider.qml +++ b/share/qtcreator/welcomescreen/components/custom/Slider.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2010 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 Qt Components project on Qt Labs. ** @@ -20,7 +20,7 @@ ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.cpp b/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.cpp index 89c072b39f..061b99edfb 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.cpp +++ b/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.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 examples of the Qt Toolkit. ** @@ -26,7 +26,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ** ** diff --git a/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.h b/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.h index f225a04dcd..d22d0acb0a 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.h +++ b/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.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 examples of the Qt Toolkit. ** @@ -26,7 +26,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ** ** diff --git a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.cpp b/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.cpp index 83c106ecd2..c3a53a6890 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.cpp +++ b/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2010 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 Qt Components project on Qt Labs. ** @@ -20,7 +20,7 @@ ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.h b/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.h index 6144281ed2..842f9aa00e 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.h +++ b/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2010 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 Qt Components project on Qt Labs. ** @@ -20,7 +20,7 @@ ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel_p.h b/share/qtcreator/welcomescreen/components/styleitem/qrangemodel_p.h index cb72ceff2f..74edf2f9f5 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel_p.h +++ b/share/qtcreator/welcomescreen/components/styleitem/qrangemodel_p.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2010 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 Qt Components project on Qt Labs. ** @@ -20,7 +20,7 @@ ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp b/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp index c16b931dcd..fecffe7b22 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp +++ b/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2010 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 examples of the Qt Toolkit. ** diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h b/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h index 1b9f9c875a..4a1da099fc 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h +++ b/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2010 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 examples of the Qt Toolkit. ** diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.cpp b/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.cpp index d615bd4a2f..6ba3473839 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.cpp +++ b/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2010 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 examples of the Qt Toolkit. ** diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.h b/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.h index 648add70c8..144cb48aff 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.h +++ b/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2010 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 examples of the Qt Toolkit. ** diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.cpp b/share/qtcreator/welcomescreen/components/styleitem/qtmenu.cpp index 3647da2d89..7a53f1f5df 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.cpp +++ b/share/qtcreator/welcomescreen/components/styleitem/qtmenu.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 Qt Components project on Qt Labs. ** @@ -20,7 +20,7 @@ ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.h b/share/qtcreator/welcomescreen/components/styleitem/qtmenu.h index 9e17db3028..164e707189 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.h +++ b/share/qtcreator/welcomescreen/components/styleitem/qtmenu.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 Qt Components project on Qt Labs. ** @@ -20,7 +20,7 @@ ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.cpp b/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.cpp index 7257795a03..b50331be74 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.cpp +++ b/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.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 examples of the Qt Toolkit. ** diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.h b/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.h index 4c402b8501..241a098ab7 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.h +++ b/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.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 examples of the Qt Toolkit. ** diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.cpp b/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.cpp index 8769990133..a946542894 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.cpp +++ b/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.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 examples of the Qt Toolkit. ** diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.h b/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.h index 7c4a1d4f1d..5fc47e2c92 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.h +++ b/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.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 examples of the Qt Toolkit. ** diff --git a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.cpp b/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.cpp index 1a7ae9e6ca..64457b5236 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.cpp +++ b/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2010 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 examples of the Qt Toolkit. ** diff --git a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.h b/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.h index f1d7016a8f..a447b7fc08 100644 --- a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.h +++ b/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2010 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 Qt Components project on Qt Labs. ** @@ -20,7 +20,7 @@ ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** ****************************************************************************/ diff --git a/src/libs/3rdparty/botan/build/botan/build.h b/src/libs/3rdparty/botan/build/botan/build.h index f674283e72..cea0132dc9 100644 --- a/src/libs/3rdparty/botan/build/botan/build.h +++ b/src/libs/3rdparty/botan/build/botan/build.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/3rdparty/precompiled_headers/botan_pch.h b/src/libs/3rdparty/precompiled_headers/botan_pch.h index 034a5845fc..6a2aa431ee 100644 --- a/src/libs/3rdparty/precompiled_headers/botan_pch.h +++ b/src/libs/3rdparty/precompiled_headers/botan_pch.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/aggregation/examples/text/main.cpp b/src/libs/aggregation/examples/text/main.cpp index 81d88727ca..30a4a1d91b 100644 --- a/src/libs/aggregation/examples/text/main.cpp +++ b/src/libs/aggregation/examples/text/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/aggregation/examples/text/main.h b/src/libs/aggregation/examples/text/main.h index 3c80fea8c6..111f55df41 100644 --- a/src/libs/aggregation/examples/text/main.h +++ b/src/libs/aggregation/examples/text/main.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/aggregation/examples/text/myinterfaces.h b/src/libs/aggregation/examples/text/myinterfaces.h index 7834af3d47..9180feaed5 100644 --- a/src/libs/aggregation/examples/text/myinterfaces.h +++ b/src/libs/aggregation/examples/text/myinterfaces.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp index 37b53ed11d..ab2042488b 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h index 2a98c84af4..a8c2b098d6 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp index 0bdf6d2b51..e9cb065554 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h index 63e3825566..b28470e5df 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp index 204bf391d3..f177ff2fa5 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h index 21819e498d..421a35e769 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp index f385aae4d4..00138f33a5 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h index a323129bd2..500d38b61b 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/qtconcurrent/QtConcurrentTools b/src/libs/qtconcurrent/QtConcurrentTools index 96cda38316..ca634a4bce 100644 --- a/src/libs/qtconcurrent/QtConcurrentTools +++ b/src/libs/qtconcurrent/QtConcurrentTools @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/libs/utils/settingsutils.h b/src/libs/utils/settingsutils.h index 6c0f494af5..fb0d8271ab 100644 --- a/src/libs/utils/settingsutils.h +++ b/src/libs/utils/settingsutils.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/coreplugin/infobar.cpp b/src/plugins/coreplugin/infobar.cpp index 29d15a02fe..bf107416bf 100644 --- a/src/plugins/coreplugin/infobar.cpp +++ b/src/plugins/coreplugin/infobar.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/coreplugin/infobar.h b/src/plugins/coreplugin/infobar.h index af8e12395b..0d8e63249a 100644 --- a/src/plugins/coreplugin/infobar.h +++ b/src/plugins/coreplugin/infobar.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/cpptools/cpptoolssettings.h b/src/plugins/cpptools/cpptoolssettings.h index 48712012af..52f8744cbc 100644 --- a/src/plugins/cpptools/cpptoolssettings.h +++ b/src/plugins/cpptools/cpptoolssettings.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) ** ** No Commercial Usage ** @@ -27,7 +27,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/designer/qt_private/abstractnewformwidget_p.h b/src/plugins/designer/qt_private/abstractnewformwidget_p.h index 7ac5dd2937..aaf1d1086e 100644 --- a/src/plugins/designer/qt_private/abstractnewformwidget_p.h +++ b/src/plugins/designer/qt_private/abstractnewformwidget_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/designer/qt_private/abstractoptionspage_p.h b/src/plugins/designer/qt_private/abstractoptionspage_p.h index 242f00f413..e0b0fd75c4 100644 --- a/src/plugins/designer/qt_private/abstractoptionspage_p.h +++ b/src/plugins/designer/qt_private/abstractoptionspage_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/designer/qt_private/abstractsettings_p.h b/src/plugins/designer/qt_private/abstractsettings_p.h index 736907f411..ca7615049c 100644 --- a/src/plugins/designer/qt_private/abstractsettings_p.h +++ b/src/plugins/designer/qt_private/abstractsettings_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/designer/qt_private/formwindowbase_p.h b/src/plugins/designer/qt_private/formwindowbase_p.h index 56a02babe1..99239adb91 100644 --- a/src/plugins/designer/qt_private/formwindowbase_p.h +++ b/src/plugins/designer/qt_private/formwindowbase_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/designer/qt_private/iconloader_p.h b/src/plugins/designer/qt_private/iconloader_p.h index 7cdd4a8105..b2eca12a9d 100644 --- a/src/plugins/designer/qt_private/iconloader_p.h +++ b/src/plugins/designer/qt_private/iconloader_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/designer/qt_private/pluginmanager_p.h b/src/plugins/designer/qt_private/pluginmanager_p.h index 6ca5003296..f1edc70836 100644 --- a/src/plugins/designer/qt_private/pluginmanager_p.h +++ b/src/plugins/designer/qt_private/pluginmanager_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h b/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h index 8c3a95d5ca..539a3a99aa 100644 --- a/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h +++ b/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/designer/qt_private/qdesigner_integration_p.h b/src/plugins/designer/qt_private/qdesigner_integration_p.h index 3014b00d39..af6ad5c9a4 100644 --- a/src/plugins/designer/qt_private/qdesigner_integration_p.h +++ b/src/plugins/designer/qt_private/qdesigner_integration_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/designer/qt_private/qsimpleresource_p.h b/src/plugins/designer/qt_private/qsimpleresource_p.h index 19cf8d5239..506efaf61c 100644 --- a/src/plugins/designer/qt_private/qsimpleresource_p.h +++ b/src/plugins/designer/qt_private/qsimpleresource_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/designer/qt_private/qtresourcemodel_p.h b/src/plugins/designer/qt_private/qtresourcemodel_p.h index 8361642052..b132eeb8b2 100644 --- a/src/plugins/designer/qt_private/qtresourcemodel_p.h +++ b/src/plugins/designer/qt_private/qtresourcemodel_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/designer/qt_private/shared_enums_p.h b/src/plugins/designer/qt_private/shared_enums_p.h index 7bc821c8b3..24296f7de6 100644 --- a/src/plugins/designer/qt_private/shared_enums_p.h +++ b/src/plugins/designer/qt_private/shared_enums_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/designer/qt_private/shared_global_p.h b/src/plugins/designer/qt_private/shared_global_p.h index 587f628097..41ead1158a 100644 --- a/src/plugins/designer/qt_private/shared_global_p.h +++ b/src/plugins/designer/qt_private/shared_global_p.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp index 4724c10edc..28331eeba2 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.h b/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.h index d6ed7b223f..acd68af923 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorsubwindow.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorsubwindow.cpp index 49a780fddf..8ba8533649 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorsubwindow.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorsubwindow.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorsubwindow.h b/src/plugins/qmldesigner/components/formeditor/formeditorsubwindow.h index 0c902b2586..5cded6394c 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorsubwindow.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorsubwindow.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.h b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.h index f7fab80b02..cd678b2647 100644 --- a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.h +++ b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/components/formeditor/manipulatorlayeritem.h b/src/plugins/qmldesigner/components/formeditor/manipulatorlayeritem.h index ae91b5ef35..53478d01d7 100644 --- a/src/plugins/qmldesigner/components/formeditor/manipulatorlayeritem.h +++ b/src/plugins/qmldesigner/components/formeditor/manipulatorlayeritem.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/components/logger/logger.cpp b/src/plugins/qmldesigner/components/logger/logger.cpp index 5b3a331ae6..42c4013b27 100644 --- a/src/plugins/qmldesigner/components/logger/logger.cpp +++ b/src/plugins/qmldesigner/components/logger/logger.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/components/logger/logger.h b/src/plugins/qmldesigner/components/logger/logger.h index 9f574b8175..e5ff44d293 100644 --- a/src/plugins/qmldesigner/components/logger/logger.h +++ b/src/plugins/qmldesigner/components/logger/logger.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.cpp index 0d9e194219..884ee0894b 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.h b/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.h index a5340bbf28..70d5293562 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.h +++ b/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h index f688102d4a..f41c825f90 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.cpp b/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.cpp index db005b6267..21013ecb0e 100644 --- a/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.cpp +++ b/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.h b/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.h index f68b5b422a..bc27f95f88 100644 --- a/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.h +++ b/src/plugins/qmldesigner/components/themeloader/qts60stylethemeio.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/exceptions/modificationgroupexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/modificationgroupexception.cpp index 20dde948b6..57655ce687 100644 --- a/src/plugins/qmldesigner/designercore/exceptions/modificationgroupexception.cpp +++ b/src/plugins/qmldesigner/designercore/exceptions/modificationgroupexception.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/include/anchorline.h b/src/plugins/qmldesigner/designercore/include/anchorline.h index 54d317719a..c41cebda88 100644 --- a/src/plugins/qmldesigner/designercore/include/anchorline.h +++ b/src/plugins/qmldesigner/designercore/include/anchorline.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/include/bytearraymodifier.h b/src/plugins/qmldesigner/designercore/include/bytearraymodifier.h index bfa2eb6a2d..9110036c17 100644 --- a/src/plugins/qmldesigner/designercore/include/bytearraymodifier.h +++ b/src/plugins/qmldesigner/designercore/include/bytearraymodifier.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/include/modificationgroupexception.h b/src/plugins/qmldesigner/designercore/include/modificationgroupexception.h index b709522b26..fbfc93bc79 100644 --- a/src/plugins/qmldesigner/designercore/include/modificationgroupexception.h +++ b/src/plugins/qmldesigner/designercore/include/modificationgroupexception.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/include/modificationgrouptoken.h b/src/plugins/qmldesigner/designercore/include/modificationgrouptoken.h index 56baa0e420..08ec189174 100644 --- a/src/plugins/qmldesigner/designercore/include/modificationgrouptoken.h +++ b/src/plugins/qmldesigner/designercore/include/modificationgrouptoken.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/include/nodeanchors.h b/src/plugins/qmldesigner/designercore/include/nodeanchors.h index 8b09513a4d..4486ccceae 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeanchors.h +++ b/src/plugins/qmldesigner/designercore/include/nodeanchors.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/include/objectpropertybinding.h b/src/plugins/qmldesigner/designercore/include/objectpropertybinding.h index 562a425f8a..db43ab5940 100644 --- a/src/plugins/qmldesigner/designercore/include/objectpropertybinding.h +++ b/src/plugins/qmldesigner/designercore/include/objectpropertybinding.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/include/propertybinding.h b/src/plugins/qmldesigner/designercore/include/propertybinding.h index 775e124530..85487a1e4f 100644 --- a/src/plugins/qmldesigner/designercore/include/propertybinding.h +++ b/src/plugins/qmldesigner/designercore/include/propertybinding.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/include/replaceallobjectdefinitionsvisitor.h b/src/plugins/qmldesigner/designercore/include/replaceallobjectdefinitionsvisitor.h index baa92ffc6a..98d901f119 100644 --- a/src/plugins/qmldesigner/designercore/include/replaceallobjectdefinitionsvisitor.h +++ b/src/plugins/qmldesigner/designercore/include/replaceallobjectdefinitionsvisitor.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/include/stylemanager.h b/src/plugins/qmldesigner/designercore/include/stylemanager.h index 8af2b28f20..838e720d8a 100644 --- a/src/plugins/qmldesigner/designercore/include/stylemanager.h +++ b/src/plugins/qmldesigner/designercore/include/stylemanager.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h b/src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h index 211c31b06c..83414ab514 100644 --- a/src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h +++ b/src/plugins/qmldesigner/designercore/include/widgetplugin_helper.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/include/widgetqueryview.h b/src/plugins/qmldesigner/designercore/include/widgetqueryview.h index 42de5494eb..5a87046bfb 100644 --- a/src/plugins/qmldesigner/designercore/include/widgetqueryview.h +++ b/src/plugins/qmldesigner/designercore/include/widgetqueryview.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/anchorline.cpp b/src/plugins/qmldesigner/designercore/model/anchorline.cpp index ee8159ec50..b8fccdd4a8 100644 --- a/src/plugins/qmldesigner/designercore/model/anchorline.cpp +++ b/src/plugins/qmldesigner/designercore/model/anchorline.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/bytearraymodifier.cpp b/src/plugins/qmldesigner/designercore/model/bytearraymodifier.cpp index 2df0d4246b..c067653070 100644 --- a/src/plugins/qmldesigner/designercore/model/bytearraymodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/bytearraymodifier.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/copyhelper.cpp b/src/plugins/qmldesigner/designercore/model/copyhelper.cpp index 7a9502c658..1a7ea3b7a0 100644 --- a/src/plugins/qmldesigner/designercore/model/copyhelper.cpp +++ b/src/plugins/qmldesigner/designercore/model/copyhelper.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/copyhelper.h b/src/plugins/qmldesigner/designercore/model/copyhelper.h index bdfd9c8de5..61f531320e 100644 --- a/src/plugins/qmldesigner/designercore/model/copyhelper.h +++ b/src/plugins/qmldesigner/designercore/model/copyhelper.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/modelrewriter.cpp b/src/plugins/qmldesigner/designercore/model/modelrewriter.cpp index e57f6f2417..a13345493f 100644 --- a/src/plugins/qmldesigner/designercore/model/modelrewriter.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelrewriter.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/modelrewriter.h b/src/plugins/qmldesigner/designercore/model/modelrewriter.h index fdbb214848..05f358fa98 100644 --- a/src/plugins/qmldesigner/designercore/model/modelrewriter.h +++ b/src/plugins/qmldesigner/designercore/model/modelrewriter.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/modificationgrouptoken.cpp b/src/plugins/qmldesigner/designercore/model/modificationgrouptoken.cpp index 5451717da3..dbadf522ce 100644 --- a/src/plugins/qmldesigner/designercore/model/modificationgrouptoken.cpp +++ b/src/plugins/qmldesigner/designercore/model/modificationgrouptoken.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/nodeanchors.cpp b/src/plugins/qmldesigner/designercore/model/nodeanchors.cpp index 83a1ac5144..e58778d5be 100644 --- a/src/plugins/qmldesigner/designercore/model/nodeanchors.cpp +++ b/src/plugins/qmldesigner/designercore/model/nodeanchors.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/objectpropertybinding.cpp b/src/plugins/qmldesigner/designercore/model/objectpropertybinding.cpp index 771b0f0146..f541abb87e 100644 --- a/src/plugins/qmldesigner/designercore/model/objectpropertybinding.cpp +++ b/src/plugins/qmldesigner/designercore/model/objectpropertybinding.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/parsedqml.cpp b/src/plugins/qmldesigner/designercore/model/parsedqml.cpp index 733c31c38f..543703df04 100644 --- a/src/plugins/qmldesigner/designercore/model/parsedqml.cpp +++ b/src/plugins/qmldesigner/designercore/model/parsedqml.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/parsedqml.h b/src/plugins/qmldesigner/designercore/model/parsedqml.h index 0bba6c57b8..9b4cbecc7d 100644 --- a/src/plugins/qmldesigner/designercore/model/parsedqml.h +++ b/src/plugins/qmldesigner/designercore/model/parsedqml.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/paster.cpp b/src/plugins/qmldesigner/designercore/model/paster.cpp index d8dcb79f3f..52f29146c6 100644 --- a/src/plugins/qmldesigner/designercore/model/paster.cpp +++ b/src/plugins/qmldesigner/designercore/model/paster.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/paster.h b/src/plugins/qmldesigner/designercore/model/paster.h index 38ccc01b9e..3f9d07c392 100644 --- a/src/plugins/qmldesigner/designercore/model/paster.h +++ b/src/plugins/qmldesigner/designercore/model/paster.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/model/propertybinding.cpp b/src/plugins/qmldesigner/designercore/model/propertybinding.cpp index 792321f0d3..d88ce07e8c 100644 --- a/src/plugins/qmldesigner/designercore/model/propertybinding.cpp +++ b/src/plugins/qmldesigner/designercore/model/propertybinding.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/designercore/preview/stylemanager.cpp b/src/plugins/qmldesigner/designercore/preview/stylemanager.cpp index 3957af5ff6..09e89a6df8 100644 --- a/src/plugins/qmldesigner/designercore/preview/stylemanager.cpp +++ b/src/plugins/qmldesigner/designercore/preview/stylemanager.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/qmlcontextpane.cpp b/src/plugins/qmldesigner/qmlcontextpane.cpp index 64cac4cf49..447a69fbe3 100644 --- a/src/plugins/qmldesigner/qmlcontextpane.cpp +++ b/src/plugins/qmldesigner/qmlcontextpane.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmldesigner/qmlcontextpane.h b/src/plugins/qmldesigner/qmlcontextpane.h index 63d334c6db..9bc72eb950 100644 --- a/src/plugins/qmldesigner/qmlcontextpane.h +++ b/src/plugins/qmldesigner/qmlcontextpane.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmljstools/qmljstoolssettings.h b/src/plugins/qmljstools/qmljstoolssettings.h index 9eb8b657c5..9e7f0815e4 100644 --- a/src/plugins/qmljstools/qmljstoolssettings.h +++ b/src/plugins/qmljstools/qmljstoolssettings.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) ** ** No Commercial Usage ** @@ -27,7 +27,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmlprofiler/codaqmlprofilerrunner.cpp b/src/plugins/qmlprofiler/codaqmlprofilerrunner.cpp index 1cc93a8cf1..9a37edd92c 100644 --- a/src/plugins/qmlprofiler/codaqmlprofilerrunner.cpp +++ b/src/plugins/qmlprofiler/codaqmlprofilerrunner.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) ** ** No Commercial Usage ** @@ -27,7 +27,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.cpp b/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.cpp index aecb8940ab..05588e507e 100644 --- a/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.cpp +++ b/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.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) ** ** No Commercial Usage ** @@ -27,7 +27,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qt4projectmanager/applicationlauncher.h b/src/plugins/qt4projectmanager/applicationlauncher.h index 0315b68c6f..a17f479fd8 100644 --- a/src/plugins/qt4projectmanager/applicationlauncher.h +++ b/src/plugins/qt4projectmanager/applicationlauncher.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp index d43a455b5f..b15d8df78a 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.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) ** ** No Commercial Usage ** @@ -27,7 +27,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.h b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.h index d316bf7793..90835dbad5 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.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) ** ** No Commercial Usage ** @@ -27,7 +27,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qtestlib/qtestlibplugin.cpp b/src/plugins/qtestlib/qtestlibplugin.cpp index 91d443e7f2..972ec25f7f 100644 --- a/src/plugins/qtestlib/qtestlibplugin.cpp +++ b/src/plugins/qtestlib/qtestlibplugin.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/qtestlib/qtestlibplugin.h b/src/plugins/qtestlib/qtestlibplugin.h index 7e89b4c0dd..612b99e8aa 100644 --- a/src/plugins/qtestlib/qtestlibplugin.h +++ b/src/plugins/qtestlib/qtestlibplugin.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/regexp/regexpplugin.cpp b/src/plugins/regexp/regexpplugin.cpp index f774121bd8..f027c92b0b 100644 --- a/src/plugins/regexp/regexpplugin.cpp +++ b/src/plugins/regexp/regexpplugin.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/regexp/regexpplugin.h b/src/plugins/regexp/regexpplugin.h index f508450960..6343dc923a 100644 --- a/src/plugins/regexp/regexpplugin.h +++ b/src/plugins/regexp/regexpplugin.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/regexp/regexpwindow.cpp b/src/plugins/regexp/regexpwindow.cpp index 7497409e09..fe9ff1f1c9 100644 --- a/src/plugins/regexp/regexpwindow.cpp +++ b/src/plugins/regexp/regexpwindow.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/regexp/regexpwindow.h b/src/plugins/regexp/regexpwindow.h index 75e2e7cf3d..9b09259443 100644 --- a/src/plugins/regexp/regexpwindow.h +++ b/src/plugins/regexp/regexpwindow.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/regexp/settings.cpp b/src/plugins/regexp/settings.cpp index 18c0820068..0a58010f0f 100644 --- a/src/plugins/regexp/settings.cpp +++ b/src/plugins/regexp/settings.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/plugins/regexp/settings.h b/src/plugins/regexp/settings.h index ba7b65fc4c..56e3543159 100644 --- a/src/plugins/regexp/settings.h +++ b/src/plugins/regexp/settings.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/shared/qrceditor/test/main.cpp b/src/shared/qrceditor/test/main.cpp index 7d1ce834b8..964abe9ba8 100644 --- a/src/shared/qrceditor/test/main.cpp +++ b/src/shared/qrceditor/test/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/shared/qrceditor/test/mainwindow.cpp b/src/shared/qrceditor/test/mainwindow.cpp index 6593687136..0b52d2ae4b 100644 --- a/src/shared/qrceditor/test/mainwindow.cpp +++ b/src/shared/qrceditor/test/mainwindow.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/shared/qrceditor/test/mainwindow.h b/src/shared/qrceditor/test/mainwindow.h index 7b9d5a88df..f5555ca99a 100644 --- a/src/shared/qrceditor/test/mainwindow.h +++ b/src/shared/qrceditor/test/mainwindow.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtcreator_gui_pch.h b/src/shared/qtcreator_gui_pch.h index 07274b2407..9402640d26 100644 --- a/src/shared/qtcreator_gui_pch.h +++ b/src/shared/qtcreator_gui_pch.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtcreator_pch.h b/src/shared/qtcreator_pch.h index 56e395ebcb..6ce7c9c5be 100644 --- a/src/shared/qtcreator_pch.h +++ b/src/shared/qtcreator_pch.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtsingleapplication/qtsinglecoreapplication.cpp b/src/shared/qtsingleapplication/qtsinglecoreapplication.cpp index f988a62f8a..60dbb66aed 100644 --- a/src/shared/qtsingleapplication/qtsinglecoreapplication.cpp +++ b/src/shared/qtsingleapplication/qtsinglecoreapplication.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtsingleapplication/qtsinglecoreapplication.h b/src/shared/qtsingleapplication/qtsinglecoreapplication.h index b51998bb12..d8817749c7 100644 --- a/src/shared/qtsingleapplication/qtsinglecoreapplication.h +++ b/src/shared/qtsingleapplication/qtsinglecoreapplication.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/shared/scriptwrapper/interface_wrap_helpers.h b/src/shared/scriptwrapper/interface_wrap_helpers.h index cee2a4e9b1..2ef7e0b669 100644 --- a/src/shared/scriptwrapper/interface_wrap_helpers.h +++ b/src/shared/scriptwrapper/interface_wrap_helpers.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/tools/gen-cpp-ast/generate-ast.cpp b/src/tools/gen-cpp-ast/generate-ast.cpp index ef50686a5f..012b35cfa9 100644 --- a/src/tools/gen-cpp-ast/generate-ast.cpp +++ b/src/tools/gen-cpp-ast/generate-ast.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/tools/makespy/main.cpp b/src/tools/makespy/main.cpp index d4056652cf..55c17b9bfb 100644 --- a/src/tools/makespy/main.cpp +++ b/src/tools/makespy/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/tools/mkvisitor/main.cpp b/src/tools/mkvisitor/main.cpp index 7b3b46bb4b..1d61e67bfa 100644 --- a/src/tools/mkvisitor/main.cpp +++ b/src/tools/mkvisitor/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/tools/qpatch/qpatch.cpp b/src/tools/qpatch/qpatch.cpp index 1e3fb49104..a4362849d1 100644 --- a/src/tools/qpatch/qpatch.cpp +++ b/src/tools/qpatch/qpatch.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/tools/qtcreatorwidgets/customwidget.h b/src/tools/qtcreatorwidgets/customwidget.h index 242e542cd2..a71ff7448b 100644 --- a/src/tools/qtcreatorwidgets/customwidget.h +++ b/src/tools/qtcreatorwidgets/customwidget.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/tools/qtcreatorwidgets/customwidgets.cpp b/src/tools/qtcreatorwidgets/customwidgets.cpp index 266ef52345..ac4f2f68f3 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.cpp +++ b/src/tools/qtcreatorwidgets/customwidgets.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/tools/qtcreatorwidgets/customwidgets.h b/src/tools/qtcreatorwidgets/customwidgets.h index 6c62f43c09..2fbee7448a 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.h +++ b/src/tools/qtcreatorwidgets/customwidgets.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/tools/qtlibspatcher/binpatch.cpp b/src/tools/qtlibspatcher/binpatch.cpp index ce20038684..5a6ff176c4 100644 --- a/src/tools/qtlibspatcher/binpatch.cpp +++ b/src/tools/qtlibspatcher/binpatch.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/tools/qtlibspatcher/binpatch.h b/src/tools/qtlibspatcher/binpatch.h index 04f2a2b91a..40e4dad799 100644 --- a/src/tools/qtlibspatcher/binpatch.h +++ b/src/tools/qtlibspatcher/binpatch.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/src/tools/qtlibspatcher/qtlibspatchermain.cpp b/src/tools/qtlibspatcher/qtlibspatchermain.cpp index 41b930aeda..c752d937c2 100644 --- a/src/tools/qtlibspatcher/qtlibspatchermain.cpp +++ b/src/tools/qtlibspatcher/qtlibspatchermain.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/aggregation/tst_aggregate.cpp b/tests/auto/aggregation/tst_aggregate.cpp index 8126c63552..d7842346e2 100644 --- a/tests/auto/aggregation/tst_aggregate.cpp +++ b/tests/auto/aggregation/tst_aggregate.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/changeset/tst_changeset.cpp b/tests/auto/changeset/tst_changeset.cpp index 00178e97a1..c8626f5191 100644 --- a/tests/auto/changeset/tst_changeset.cpp +++ b/tests/auto/changeset/tst_changeset.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp index f5aea49a85..35f55e26c1 100644 --- a/tests/auto/cplusplus/ast/tst_ast.cpp +++ b/tests/auto/cplusplus/ast/tst_ast.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp index 9dbe5506a7..fedea8c909 100644 --- a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp +++ b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/codegen/tst_codegen.cpp b/tests/auto/cplusplus/codegen/tst_codegen.cpp index 78ffdfa677..158669db0b 100644 --- a/tests/auto/cplusplus/codegen/tst_codegen.cpp +++ b/tests/auto/cplusplus/codegen/tst_codegen.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/findusages/tst_findusages.cpp b/tests/auto/cplusplus/findusages/tst_findusages.cpp index fe73b54bdb..d99988ae9e 100644 --- a/tests/auto/cplusplus/findusages/tst_findusages.cpp +++ b/tests/auto/cplusplus/findusages/tst_findusages.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/lookup/tst_lookup.cpp b/tests/auto/cplusplus/lookup/tst_lookup.cpp index 347ebd4d6d..baabd04624 100644 --- a/tests/auto/cplusplus/lookup/tst_lookup.cpp +++ b/tests/auto/cplusplus/lookup/tst_lookup.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/misc/tst_misc.cpp b/tests/auto/cplusplus/misc/tst_misc.cpp index 3e465aff05..b814992b8d 100644 --- a/tests/auto/cplusplus/misc/tst_misc.cpp +++ b/tests/auto/cplusplus/misc/tst_misc.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp index 98a6dbdd9d..b6697e6907 100644 --- a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp +++ b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp index 5780ac4910..144b87242a 100644 --- a/tests/auto/cplusplus/semantic/tst_semantic.cpp +++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp b/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp index bc1289a28d..361a97e47f 100644 --- a/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp +++ b/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp b/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp index e2cfa8d85a..1ab85cfd55 100644 --- a/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp +++ b/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 0364e70b33..9471b230bc 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp index 1d2cca0016..7586540bf0 100644 --- a/tests/auto/debugger/tst_gdb.cpp +++ b/tests/auto/debugger/tst_gdb.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/debugger/tst_version.cpp b/tests/auto/debugger/tst_version.cpp index dee60eedbf..75d91a19cd 100644 --- a/tests/auto/debugger/tst_version.cpp +++ b/tests/auto/debugger/tst_version.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/environment/tst_environment.cpp b/tests/auto/environment/tst_environment.cpp index bf9a260685..171eab7238 100644 --- a/tests/auto/environment/tst_environment.cpp +++ b/tests/auto/environment/tst_environment.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp index 814fd139aa..f116b5c6d3 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h index 0a6cac6143..529455f888 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp index cd53d96a5d..ee20164a1c 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h index df6aa752e6..5ee45d58fe 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp index f1da14bd4f..ee7dbec120 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ #include "plugin3.h" diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h index 75277b318d..3ee0d5c399 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp index ff3a35522b..f146f0ad0f 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h index 987196fe94..58d9777c23 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp index c1c38e3a69..44e41a02c3 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h index 4ba3b35b57..b2e9217517 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp index b87dfa41aa..a21d83fa8f 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h index 816295a305..c6e6a4ef92 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ #ifndef PLUGIN3_H diff --git a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp index fc7c2d7ad9..697496fdfc 100644 --- a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp +++ b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp index acbd4c2f37..c8d31230cd 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp +++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h index 1bcc08076e..0837588b8b 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h +++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h index 519867fc0a..718f530dfb 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h +++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp index c1df40de1f..123ca6d0b5 100644 --- a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp +++ b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/fakevim/tst_fakevim.cpp b/tests/auto/fakevim/tst_fakevim.cpp index 1192d863e9..c0bf411f39 100644 --- a/tests/auto/fakevim/tst_fakevim.cpp +++ b/tests/auto/fakevim/tst_fakevim.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/filesearch/tst_filesearch.cpp b/tests/auto/filesearch/tst_filesearch.cpp index 5d8b36c045..080013e04a 100644 --- a/tests/auto/filesearch/tst_filesearch.cpp +++ b/tests/auto/filesearch/tst_filesearch.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/basetextdocumentlayout.h b/tests/auto/generichighlighter/highlighterengine/basetextdocumentlayout.h index 50ff40f782..ceb7dec1b2 100644 --- a/tests/auto/generichighlighter/highlighterengine/basetextdocumentlayout.h +++ b/tests/auto/generichighlighter/highlighterengine/basetextdocumentlayout.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/formats.cpp b/tests/auto/generichighlighter/highlighterengine/formats.cpp index 854acf893f..ec0d8b7109 100644 --- a/tests/auto/generichighlighter/highlighterengine/formats.cpp +++ b/tests/auto/generichighlighter/highlighterengine/formats.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/formats.h b/tests/auto/generichighlighter/highlighterengine/formats.h index 81823697ec..dddc7abce7 100644 --- a/tests/auto/generichighlighter/highlighterengine/formats.h +++ b/tests/auto/generichighlighter/highlighterengine/formats.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp b/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp index a1e5ed8e94..078aa3a8f3 100644 --- a/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp +++ b/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/highlightermock.h b/tests/auto/generichighlighter/highlighterengine/highlightermock.h index de36ba328c..f085c82626 100644 --- a/tests/auto/generichighlighter/highlighterengine/highlightermock.h +++ b/tests/auto/generichighlighter/highlighterengine/highlightermock.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h index 00243c13bb..34082947e3 100644 --- a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h +++ b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/tabsettings.h b/tests/auto/generichighlighter/highlighterengine/tabsettings.h index 40f63ee22c..9a20f3641a 100644 --- a/tests/auto/generichighlighter/highlighterengine/tabsettings.h +++ b/tests/auto/generichighlighter/highlighterengine/tabsettings.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp b/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp index 24ae2376bc..2c6a8932d8 100644 --- a/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp +++ b/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp b/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp index e5e97f4d6f..e270ee0297 100644 --- a/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp +++ b/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/icheckbuild/ichecklib.cpp b/tests/auto/icheckbuild/ichecklib.cpp index 0d6e186a0a..22aefc106b 100644 --- a/tests/auto/icheckbuild/ichecklib.cpp +++ b/tests/auto/icheckbuild/ichecklib.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/icheckbuild/ichecklib.h b/tests/auto/icheckbuild/ichecklib.h index ba0f678398..8c692f9675 100644 --- a/tests/auto/icheckbuild/ichecklib.h +++ b/tests/auto/icheckbuild/ichecklib.h @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/icheckbuild/ichecklib_global.h b/tests/auto/icheckbuild/ichecklib_global.h index 6801dd9616..d46d22c97b 100644 --- a/tests/auto/icheckbuild/ichecklib_global.h +++ b/tests/auto/icheckbuild/ichecklib_global.h @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/icheckbuild/parsemanager.cpp b/tests/auto/icheckbuild/parsemanager.cpp index feda22ae05..1ee0769c65 100644 --- a/tests/auto/icheckbuild/parsemanager.cpp +++ b/tests/auto/icheckbuild/parsemanager.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/icheckbuild/parsemanager.h b/tests/auto/icheckbuild/parsemanager.h index f00154d0ee..ee8cb2b168 100644 --- a/tests/auto/icheckbuild/parsemanager.h +++ b/tests/auto/icheckbuild/parsemanager.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/icheckbuild/tst_icheckbuild.cpp b/tests/auto/icheckbuild/tst_icheckbuild.cpp index 0f765b165c..7a55da291d 100644 --- a/tests/auto/icheckbuild/tst_icheckbuild.cpp +++ b/tests/auto/icheckbuild/tst_icheckbuild.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/ioutils/tst_ioutils.cpp b/tests/auto/ioutils/tst_ioutils.cpp index 91ea659999..8783fc32a7 100644 --- a/tests/auto/ioutils/tst_ioutils.cpp +++ b/tests/auto/ioutils/tst_ioutils.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/profilewriter/tst_profilewriter.cpp b/tests/auto/profilewriter/tst_profilewriter.cpp index aad0204acb..5d0a374ead 100644 --- a/tests/auto/profilewriter/tst_profilewriter.cpp +++ b/tests/auto/profilewriter/tst_profilewriter.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/codemodel/basic/tst_basic.cpp b/tests/auto/qml/codemodel/basic/tst_basic.cpp index 94df6bbdde..b9d175dd12 100644 --- a/tests/auto/qml/codemodel/basic/tst_basic.cpp +++ b/tests/auto/qml/codemodel/basic/tst_basic.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.cpp b/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.cpp index 782058f66a..c9fca2e652 100644 --- a/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.cpp +++ b/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.h b/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.h index c4b062fb83..8f8d5ad26c 100644 --- a/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.h +++ b/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/common/statichelpers.cpp b/tests/auto/qml/qmldesigner/common/statichelpers.cpp index cd0eb6058e..287d60221d 100644 --- a/tests/auto/qml/qmldesigner/common/statichelpers.cpp +++ b/tests/auto/qml/qmldesigner/common/statichelpers.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp b/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp index f9ddd5fd03..f0f96aa571 100644 --- a/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp +++ b/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/coretests/testrewriterview.h b/tests/auto/qml/qmldesigner/coretests/testrewriterview.h index f142393dbd..1748cdbb64 100644 --- a/tests/auto/qml/qmldesigner/coretests/testrewriterview.h +++ b/tests/auto/qml/qmldesigner/coretests/testrewriterview.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index cef95e1690..e60c8b76bd 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.h b/tests/auto/qml/qmldesigner/coretests/tst_testcore.h index 61167e75a6..5bf79e57ce 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.h +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp index cb0dd7f173..1927bf5b27 100644 --- a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp +++ b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.h b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.h index 0d041f4630..235fb40fe2 100644 --- a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.h +++ b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/testview.cpp b/tests/auto/qml/qmldesigner/testview.cpp index 3851ac77a0..e445e27cf6 100644 --- a/tests/auto/qml/qmldesigner/testview.cpp +++ b/tests/auto/qml/qmldesigner/testview.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/testview.h b/tests/auto/qml/qmldesigner/testview.h index 30c79767e8..6039fc2489 100644 --- a/tests/auto/qml/qmldesigner/testview.h +++ b/tests/auto/qml/qmldesigner/testview.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp b/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp index d03593fba8..f45f35ef68 100644 --- a/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp +++ b/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmleditor/qmllookup/tst_qmllookup.cpp b/tests/auto/qml/qmleditor/qmllookup/tst_qmllookup.cpp index 7ec4e8747d..4977c88ee5 100644 --- a/tests/auto/qml/qmleditor/qmllookup/tst_qmllookup.cpp +++ b/tests/auto/qml/qmleditor/qmllookup/tst_qmllookup.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp index c89018e65c..ea326182bc 100644 --- a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp +++ b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qtcprocess/tst_qtcprocess.cpp b/tests/auto/qtcprocess/tst_qtcprocess.cpp index 35b0d13433..d8d9dbb59c 100644 --- a/tests/auto/qtcprocess/tst_qtcprocess.cpp +++ b/tests/auto/qtcprocess/tst_qtcprocess.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/auto/utils_stringutils/tst_stringutils.cpp b/tests/auto/utils_stringutils/tst_stringutils.cpp index 270e286561..f6d372f7b9 100644 --- a/tests/auto/utils_stringutils/tst_stringutils.cpp +++ b/tests/auto/utils_stringutils/tst_stringutils.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/appwizards/helpers.cpp b/tests/manual/appwizards/helpers.cpp index 1c548b1ded..ddd636df21 100644 --- a/tests/manual/appwizards/helpers.cpp +++ b/tests/manual/appwizards/helpers.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/appwizards/main.cpp b/tests/manual/appwizards/main.cpp index 2f8b7c81a8..f6b1a8a5ba 100644 --- a/tests/manual/appwizards/main.cpp +++ b/tests/manual/appwizards/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-frontend/main.cpp b/tests/manual/cplusplus-frontend/main.cpp index 464caaf555..8926bff0d6 100644 --- a/tests/manual/cplusplus-frontend/main.cpp +++ b/tests/manual/cplusplus-frontend/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-frontend/tests/t1.cpp b/tests/manual/cplusplus-frontend/tests/t1.cpp index 37a7a6ef87..c4858a88d6 100644 --- a/tests/manual/cplusplus-frontend/tests/t1.cpp +++ b/tests/manual/cplusplus-frontend/tests/t1.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-tools/detail/header.h b/tests/manual/cplusplus-tools/detail/header.h index 99ae65de0e..72a50dd98a 100644 --- a/tests/manual/cplusplus-tools/detail/header.h +++ b/tests/manual/cplusplus-tools/detail/header.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-tools/detail/source.cpp b/tests/manual/cplusplus-tools/detail/source.cpp index c1edc824d4..e820a14a2a 100644 --- a/tests/manual/cplusplus-tools/detail/source.cpp +++ b/tests/manual/cplusplus-tools/detail/source.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-tools/dummy.cpp b/tests/manual/cplusplus-tools/dummy.cpp index 190bd2e67d..e87e444376 100644 --- a/tests/manual/cplusplus-tools/dummy.cpp +++ b/tests/manual/cplusplus-tools/dummy.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-tools/dummy.h b/tests/manual/cplusplus-tools/dummy.h index 421332a1a3..a898f9b66a 100644 --- a/tests/manual/cplusplus-tools/dummy.h +++ b/tests/manual/cplusplus-tools/dummy.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-tools/main.cpp b/tests/manual/cplusplus-tools/main.cpp index 75ab889991..fddb143a38 100644 --- a/tests/manual/cplusplus-tools/main.cpp +++ b/tests/manual/cplusplus-tools/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cppquickfix/completeswitchcasestatement.cpp b/tests/manual/cppquickfix/completeswitchcasestatement.cpp index fcf173f052..6f8286eed9 100644 --- a/tests/manual/cppquickfix/completeswitchcasestatement.cpp +++ b/tests/manual/cppquickfix/completeswitchcasestatement.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cppquickfix/convertnumericliteral.cpp b/tests/manual/cppquickfix/convertnumericliteral.cpp index 22576e6781..55bf4f0e51 100644 --- a/tests/manual/cppquickfix/convertnumericliteral.cpp +++ b/tests/manual/cppquickfix/convertnumericliteral.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/dockwidgets/main.cpp b/tests/manual/dockwidgets/main.cpp index ea305d91e3..3521ab0458 100644 --- a/tests/manual/dockwidgets/main.cpp +++ b/tests/manual/dockwidgets/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/dockwidgets/mainwindow.cpp b/tests/manual/dockwidgets/mainwindow.cpp index 9b7dfd96b7..eacd29d05c 100644 --- a/tests/manual/dockwidgets/mainwindow.cpp +++ b/tests/manual/dockwidgets/mainwindow.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/dockwidgets/mainwindow.h b/tests/manual/dockwidgets/mainwindow.h index 3e83a3a687..b146ee3a96 100644 --- a/tests/manual/dockwidgets/mainwindow.h +++ b/tests/manual/dockwidgets/mainwindow.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/fakevim/main.cpp b/tests/manual/fakevim/main.cpp index a0f9c7f1ae..491779d131 100644 --- a/tests/manual/fakevim/main.cpp +++ b/tests/manual/fakevim/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/gdbdebugger/boost/main.cpp b/tests/manual/gdbdebugger/boost/main.cpp index 5bffac268e..46f33b9723 100644 --- a/tests/manual/gdbdebugger/boost/main.cpp +++ b/tests/manual/gdbdebugger/boost/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/gdbdebugger/gui/mainwindow.cpp b/tests/manual/gdbdebugger/gui/mainwindow.cpp index a9aa5895ae..104671b994 100644 --- a/tests/manual/gdbdebugger/gui/mainwindow.cpp +++ b/tests/manual/gdbdebugger/gui/mainwindow.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/gdbdebugger/gui/mainwindow.h b/tests/manual/gdbdebugger/gui/mainwindow.h index d46535e587..2a7479e423 100644 --- a/tests/manual/gdbdebugger/gui/mainwindow.h +++ b/tests/manual/gdbdebugger/gui/mainwindow.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/gdbdebugger/gui/tst_gui.cpp b/tests/manual/gdbdebugger/gui/tst_gui.cpp index 27505e9f1e..e537b0db97 100644 --- a/tests/manual/gdbdebugger/gui/tst_gui.cpp +++ b/tests/manual/gdbdebugger/gui/tst_gui.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/gdbdebugger/helper/main.cpp b/tests/manual/gdbdebugger/helper/main.cpp index bd2771fdbe..72139b4c27 100644 --- a/tests/manual/gdbdebugger/helper/main.cpp +++ b/tests/manual/gdbdebugger/helper/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/gdbdebugger/script/math.js b/tests/manual/gdbdebugger/script/math.js index 28b152876f..60462b8343 100644 --- a/tests/manual/gdbdebugger/script/math.js +++ b/tests/manual/gdbdebugger/script/math.js @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/gdbdebugger/simple/deep/deep/simple_gdbtest_app.h b/tests/manual/gdbdebugger/simple/deep/deep/simple_gdbtest_app.h index 0fe9c7b81e..975d64f2a6 100644 --- a/tests/manual/gdbdebugger/simple/deep/deep/simple_gdbtest_app.h +++ b/tests/manual/gdbdebugger/simple/deep/deep/simple_gdbtest_app.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) ** ** No Commercial Usage ** @@ -27,7 +27,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp index c490f0b419..4f3379114d 100644 --- a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp +++ b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp b/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp index d1e8cb03e0..535a22c40f 100644 --- a/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp +++ b/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/gdbdebugger/spacy path/app with space.cpp b/tests/manual/gdbdebugger/spacy path/app with space.cpp index 7b0ee3781d..f94dd73a46 100644 --- a/tests/manual/gdbdebugger/spacy path/app with space.cpp +++ b/tests/manual/gdbdebugger/spacy path/app with space.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/gdbdebugger/spacy path/plugin with space.cpp b/tests/manual/gdbdebugger/spacy path/plugin with space.cpp index ea9498d51e..4b2b81c0f7 100644 --- a/tests/manual/gdbdebugger/spacy path/plugin with space.cpp +++ b/tests/manual/gdbdebugger/spacy path/plugin with space.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com ** **************************************************************************/ diff --git a/tests/manual/gdbdebugger/spacy-file/app with space.cpp b/tests/manual/gdbdebugger/spacy-file/app with space.cpp index 7b0ee3781d..5048b41d18 100644 --- a/tests/manual/gdbdebugger/spacy-file/app with space.cpp +++ b/tests/manual/gdbdebugger/spacy-file/app with space.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com ** **************************************************************************/ diff --git a/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp b/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp index ea9498d51e..4b2b81c0f7 100644 --- a/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp +++ b/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp @@ -25,7 +25,7 @@ ** 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. +** Nokia at info@qt.nokia.com ** **************************************************************************/ diff --git a/tests/manual/plain-cplusplus/Preprocessor.cpp b/tests/manual/plain-cplusplus/Preprocessor.cpp index 180cce83e7..d857a6e2c4 100644 --- a/tests/manual/plain-cplusplus/Preprocessor.cpp +++ b/tests/manual/plain-cplusplus/Preprocessor.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/plain-cplusplus/Preprocessor.h b/tests/manual/plain-cplusplus/Preprocessor.h index e4c1c48e75..512f6850cc 100644 --- a/tests/manual/plain-cplusplus/Preprocessor.h +++ b/tests/manual/plain-cplusplus/Preprocessor.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ #ifndef CPLUSPLUS_PREPROCESSOR_H diff --git a/tests/manual/plain-cplusplus/main.cpp b/tests/manual/plain-cplusplus/main.cpp index 443397b656..78039deab3 100644 --- a/tests/manual/plain-cplusplus/main.cpp +++ b/tests/manual/plain-cplusplus/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/preprocessor/main.cpp b/tests/manual/preprocessor/main.cpp index 15ef5f5c71..a90ce47f9c 100644 --- a/tests/manual/preprocessor/main.cpp +++ b/tests/manual/preprocessor/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/process/main.cpp b/tests/manual/process/main.cpp index beecc16b28..bc1bb5e480 100644 --- a/tests/manual/process/main.cpp +++ b/tests/manual/process/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/process/mainwindow.cpp b/tests/manual/process/mainwindow.cpp index 9ed451832b..f88ca43b59 100644 --- a/tests/manual/process/mainwindow.cpp +++ b/tests/manual/process/mainwindow.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** *************************************************************************/ diff --git a/tests/manual/process/mainwindow.h b/tests/manual/process/mainwindow.h index 5cc48432a3..e3dacb2550 100644 --- a/tests/manual/process/mainwindow.h +++ b/tests/manual/process/mainwindow.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/progressmanager/main.cpp b/tests/manual/progressmanager/main.cpp index a45c87e39e..83896f55fa 100644 --- a/tests/manual/progressmanager/main.cpp +++ b/tests/manual/progressmanager/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/progressmanager/roundprogress.cpp b/tests/manual/progressmanager/roundprogress.cpp index 22449cbdf1..b116c2be70 100644 --- a/tests/manual/progressmanager/roundprogress.cpp +++ b/tests/manual/progressmanager/roundprogress.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/progressmanager/roundprogress.h b/tests/manual/progressmanager/roundprogress.h index 43f638e13d..dbc5d636c5 100644 --- a/tests/manual/progressmanager/roundprogress.h +++ b/tests/manual/progressmanager/roundprogress.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/proparser/main.cpp b/tests/manual/proparser/main.cpp index aec7292122..fb1543557f 100644 --- a/tests/manual/proparser/main.cpp +++ b/tests/manual/proparser/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/errorhandling/main.cpp b/tests/manual/ssh/errorhandling/main.cpp index c4308c8d0f..b67c1b5951 100644 --- a/tests/manual/ssh/errorhandling/main.cpp +++ b/tests/manual/ssh/errorhandling/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/remoteprocess/argumentscollector.cpp b/tests/manual/ssh/remoteprocess/argumentscollector.cpp index 8ba66d7ea3..73e348b1e2 100644 --- a/tests/manual/ssh/remoteprocess/argumentscollector.cpp +++ b/tests/manual/ssh/remoteprocess/argumentscollector.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/remoteprocess/argumentscollector.h b/tests/manual/ssh/remoteprocess/argumentscollector.h index 473852cefa..6efdb0d1a7 100644 --- a/tests/manual/ssh/remoteprocess/argumentscollector.h +++ b/tests/manual/ssh/remoteprocess/argumentscollector.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/remoteprocess/main.cpp b/tests/manual/ssh/remoteprocess/main.cpp index 89ea6c5c2e..747ee32f2b 100644 --- a/tests/manual/ssh/remoteprocess/main.cpp +++ b/tests/manual/ssh/remoteprocess/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/remoteprocess/remoteprocesstest.cpp b/tests/manual/ssh/remoteprocess/remoteprocesstest.cpp index cb1f489ed4..854caadea2 100644 --- a/tests/manual/ssh/remoteprocess/remoteprocesstest.cpp +++ b/tests/manual/ssh/remoteprocess/remoteprocesstest.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/remoteprocess/remoteprocesstest.h b/tests/manual/ssh/remoteprocess/remoteprocesstest.h index 6163f66f00..d990379df0 100644 --- a/tests/manual/ssh/remoteprocess/remoteprocesstest.h +++ b/tests/manual/ssh/remoteprocess/remoteprocesstest.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/sftp/argumentscollector.cpp b/tests/manual/ssh/sftp/argumentscollector.cpp index 369f0c6fa4..2bb5972596 100644 --- a/tests/manual/ssh/sftp/argumentscollector.cpp +++ b/tests/manual/ssh/sftp/argumentscollector.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/sftp/argumentscollector.h b/tests/manual/ssh/sftp/argumentscollector.h index ad0d44f482..460fe2df52 100644 --- a/tests/manual/ssh/sftp/argumentscollector.h +++ b/tests/manual/ssh/sftp/argumentscollector.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/sftp/main.cpp b/tests/manual/ssh/sftp/main.cpp index be36291656..51d5d8a70b 100644 --- a/tests/manual/ssh/sftp/main.cpp +++ b/tests/manual/ssh/sftp/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/sftp/parameters.h b/tests/manual/ssh/sftp/parameters.h index 66a364bc3d..70372f7ad4 100644 --- a/tests/manual/ssh/sftp/parameters.h +++ b/tests/manual/ssh/sftp/parameters.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/sftp/sftptest.cpp b/tests/manual/ssh/sftp/sftptest.cpp index 077ddc19c3..aab3cb2e67 100644 --- a/tests/manual/ssh/sftp/sftptest.cpp +++ b/tests/manual/ssh/sftp/sftptest.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/sftp/sftptest.h b/tests/manual/ssh/sftp/sftptest.h index 34c6607c0d..c1a093adc2 100644 --- a/tests/manual/ssh/sftp/sftptest.h +++ b/tests/manual/ssh/sftp/sftptest.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/tools/codaclient/codaclientapplication.cpp b/tests/tools/codaclient/codaclientapplication.cpp index 62a55385d4..b6667b4f1b 100644 --- a/tests/tools/codaclient/codaclientapplication.cpp +++ b/tests/tools/codaclient/codaclientapplication.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/tools/codaclient/codaclientapplication.h b/tests/tools/codaclient/codaclientapplication.h index 6bed1c9939..88beb596b8 100644 --- a/tests/tools/codaclient/codaclientapplication.h +++ b/tests/tools/codaclient/codaclientapplication.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/tools/codaclient/main.cpp b/tests/tools/codaclient/main.cpp index 80487ab5aa..0c6ba42e69 100644 --- a/tests/tools/codaclient/main.cpp +++ b/tests/tools/codaclient/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/tools/cplusplus-dump/dumpers.inc b/tests/tools/cplusplus-dump/dumpers.inc index c97824eb3d..507ef64a5f 100644 --- a/tests/tools/cplusplus-dump/dumpers.inc +++ b/tests/tools/cplusplus-dump/dumpers.inc @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/tools/cplusplus-dump/main.cpp b/tests/tools/cplusplus-dump/main.cpp index 7fb910f0f2..861b98528e 100644 --- a/tests/tools/cplusplus-dump/main.cpp +++ b/tests/tools/cplusplus-dump/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/tools/qml-ast2dot/main.cpp b/tests/tools/qml-ast2dot/main.cpp index a49250709b..8c77249d44 100644 --- a/tests/tools/qml-ast2dot/main.cpp +++ b/tests/tools/qml-ast2dot/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/tools/qtquickappblaster/main.cpp b/tests/tools/qtquickappblaster/main.cpp index 36e5819506..0b235e1942 100644 --- a/tests/tools/qtquickappblaster/main.cpp +++ b/tests/tools/qtquickappblaster/main.cpp @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/callgrind/callgrindparsertests.cpp b/tests/valgrind/callgrind/callgrindparsertests.cpp index 73a6c8bd4d..b1e6a8db9f 100644 --- a/tests/valgrind/callgrind/callgrindparsertests.cpp +++ b/tests/valgrind/callgrind/callgrindparsertests.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) ** ** No Commercial Usage ** @@ -27,7 +27,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/callgrind/callgrindparsertests.h b/tests/valgrind/callgrind/callgrindparsertests.h index 545c77f435..a63a05f443 100644 --- a/tests/valgrind/callgrind/callgrindparsertests.h +++ b/tests/valgrind/callgrind/callgrindparsertests.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) ** ** No Commercial Usage ** @@ -27,7 +27,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/callgrind/modeltest.cpp b/tests/valgrind/callgrind/modeltest.cpp index 53030f8c6b..d6ec5f1d1f 100644 --- a/tests/valgrind/callgrind/modeltest.cpp +++ b/tests/valgrind/callgrind/modeltest.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) ** ** No Commercial Usage ** @@ -27,7 +27,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/callgrind/modeltest.h b/tests/valgrind/callgrind/modeltest.h index 0a6e181c17..1f93af1aa3 100644 --- a/tests/valgrind/callgrind/modeltest.h +++ b/tests/valgrind/callgrind/modeltest.h @@ -26,7 +26,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/modeldemo.cpp b/tests/valgrind/memcheck/modeldemo.cpp index a5cf21d24b..fdaac18046 100644 --- a/tests/valgrind/memcheck/modeldemo.cpp +++ b/tests/valgrind/memcheck/modeldemo.cpp @@ -28,7 +28,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/modeldemo.h b/tests/valgrind/memcheck/modeldemo.h index 0f6fcb4760..135535e3ca 100644 --- a/tests/valgrind/memcheck/modeldemo.h +++ b/tests/valgrind/memcheck/modeldemo.h @@ -28,7 +28,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testrunner.cpp b/tests/valgrind/memcheck/testrunner.cpp index 2618f73924..c063e5227e 100644 --- a/tests/valgrind/memcheck/testrunner.cpp +++ b/tests/valgrind/memcheck/testrunner.cpp @@ -28,7 +28,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testrunner.h b/tests/valgrind/memcheck/testrunner.h index 3f8efe029c..36218c5684 100644 --- a/tests/valgrind/memcheck/testrunner.h +++ b/tests/valgrind/memcheck/testrunner.h @@ -28,7 +28,7 @@ ** 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. +** Nokia at info@qt.nokia.com. ** **************************************************************************/ |