aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2011-07-05 18:26:01 +0200
committerhjk <qthjk@ovi.com>2011-07-06 11:14:01 +0200
commita322bd606fa966a011896a1db36e240d27c1d60f (patch)
tree79b3974fb5ae7ac6c85d8d713940f4bc8480f56d /tests
parent78b1b042e3ef361a81331b2f1ea289fe674c03c0 (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>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/aggregation/tst_aggregate.cpp2
-rw-r--r--tests/auto/changeset/tst_changeset.cpp2
-rw-r--r--tests/auto/cplusplus/ast/tst_ast.cpp2
-rw-r--r--tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp2
-rw-r--r--tests/auto/cplusplus/codegen/tst_codegen.cpp2
-rw-r--r--tests/auto/cplusplus/findusages/tst_findusages.cpp2
-rw-r--r--tests/auto/cplusplus/lookup/tst_lookup.cpp2
-rw-r--r--tests/auto/cplusplus/misc/tst_misc.cpp2
-rw-r--r--tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp2
-rw-r--r--tests/auto/cplusplus/semantic/tst_semantic.cpp2
-rw-r--r--tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp2
-rw-r--r--tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp2
-rw-r--r--tests/auto/debugger/tst_dumpers.cpp2
-rw-r--r--tests/auto/debugger/tst_gdb.cpp2
-rw-r--r--tests/auto/debugger/tst_version.cpp2
-rw-r--r--tests/auto/environment/tst_environment.cpp2
-rw-r--r--tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp2
-rw-r--r--tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h2
-rw-r--r--tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp2
-rw-r--r--tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h2
-rw-r--r--tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp2
-rw-r--r--tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h2
-rw-r--r--tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp2
-rw-r--r--tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h2
-rw-r--r--tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp2
-rw-r--r--tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h2
-rw-r--r--tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp2
-rw-r--r--tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h2
-rw-r--r--tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp2
-rw-r--r--tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp2
-rw-r--r--tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h2
-rw-r--r--tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h2
-rw-r--r--tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp2
-rw-r--r--tests/auto/fakevim/tst_fakevim.cpp2
-rw-r--r--tests/auto/filesearch/tst_filesearch.cpp2
-rw-r--r--tests/auto/generichighlighter/highlighterengine/basetextdocumentlayout.h2
-rw-r--r--tests/auto/generichighlighter/highlighterengine/formats.cpp2
-rw-r--r--tests/auto/generichighlighter/highlighterengine/formats.h2
-rw-r--r--tests/auto/generichighlighter/highlighterengine/highlightermock.cpp2
-rw-r--r--tests/auto/generichighlighter/highlighterengine/highlightermock.h2
-rw-r--r--tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h2
-rw-r--r--tests/auto/generichighlighter/highlighterengine/tabsettings.h2
-rw-r--r--tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp2
-rw-r--r--tests/auto/generichighlighter/specificrules/tst_specificrules.cpp2
-rw-r--r--tests/auto/icheckbuild/ichecklib.cpp2
-rw-r--r--tests/auto/icheckbuild/ichecklib.h2
-rw-r--r--tests/auto/icheckbuild/ichecklib_global.h2
-rw-r--r--tests/auto/icheckbuild/parsemanager.cpp2
-rw-r--r--tests/auto/icheckbuild/parsemanager.h2
-rw-r--r--tests/auto/icheckbuild/tst_icheckbuild.cpp2
-rw-r--r--tests/auto/ioutils/tst_ioutils.cpp2
-rw-r--r--tests/auto/profilewriter/tst_profilewriter.cpp2
-rw-r--r--tests/auto/qml/codemodel/basic/tst_basic.cpp2
-rw-r--r--tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.cpp2
-rw-r--r--tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.h2
-rw-r--r--tests/auto/qml/qmldesigner/common/statichelpers.cpp2
-rw-r--r--tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp2
-rw-r--r--tests/auto/qml/qmldesigner/coretests/testrewriterview.h2
-rw-r--r--tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp2
-rw-r--r--tests/auto/qml/qmldesigner/coretests/tst_testcore.h2
-rw-r--r--tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp2
-rw-r--r--tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.h2
-rw-r--r--tests/auto/qml/qmldesigner/testview.cpp2
-rw-r--r--tests/auto/qml/qmldesigner/testview.h2
-rw-r--r--tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp2
-rw-r--r--tests/auto/qml/qmleditor/qmllookup/tst_qmllookup.cpp2
-rw-r--r--tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp2
-rw-r--r--tests/auto/qtcprocess/tst_qtcprocess.cpp2
-rw-r--r--tests/auto/utils_stringutils/tst_stringutils.cpp2
-rw-r--r--tests/manual/appwizards/helpers.cpp2
-rw-r--r--tests/manual/appwizards/main.cpp2
-rw-r--r--tests/manual/cplusplus-frontend/main.cpp2
-rw-r--r--tests/manual/cplusplus-frontend/tests/t1.cpp2
-rw-r--r--tests/manual/cplusplus-tools/detail/header.h2
-rw-r--r--tests/manual/cplusplus-tools/detail/source.cpp2
-rw-r--r--tests/manual/cplusplus-tools/dummy.cpp2
-rw-r--r--tests/manual/cplusplus-tools/dummy.h2
-rw-r--r--tests/manual/cplusplus-tools/main.cpp2
-rw-r--r--tests/manual/cppquickfix/completeswitchcasestatement.cpp2
-rw-r--r--tests/manual/cppquickfix/convertnumericliteral.cpp2
-rw-r--r--tests/manual/dockwidgets/main.cpp2
-rw-r--r--tests/manual/dockwidgets/mainwindow.cpp2
-rw-r--r--tests/manual/dockwidgets/mainwindow.h2
-rw-r--r--tests/manual/fakevim/main.cpp2
-rw-r--r--tests/manual/gdbdebugger/boost/main.cpp2
-rw-r--r--tests/manual/gdbdebugger/gui/mainwindow.cpp2
-rw-r--r--tests/manual/gdbdebugger/gui/mainwindow.h2
-rw-r--r--tests/manual/gdbdebugger/gui/tst_gui.cpp2
-rw-r--r--tests/manual/gdbdebugger/helper/main.cpp2
-rw-r--r--tests/manual/gdbdebugger/script/math.js2
-rw-r--r--tests/manual/gdbdebugger/simple/deep/deep/simple_gdbtest_app.h4
-rw-r--r--tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp2
-rw-r--r--tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp2
-rw-r--r--tests/manual/gdbdebugger/spacy path/app with space.cpp2
-rw-r--r--tests/manual/gdbdebugger/spacy path/plugin with space.cpp2
-rw-r--r--tests/manual/gdbdebugger/spacy-file/app with space.cpp2
-rw-r--r--tests/manual/gdbdebugger/spacy-file/plugin with space.cpp2
-rw-r--r--tests/manual/plain-cplusplus/Preprocessor.cpp2
-rw-r--r--tests/manual/plain-cplusplus/Preprocessor.h2
-rw-r--r--tests/manual/plain-cplusplus/main.cpp2
-rw-r--r--tests/manual/preprocessor/main.cpp2
-rw-r--r--tests/manual/process/main.cpp2
-rw-r--r--tests/manual/process/mainwindow.cpp2
-rw-r--r--tests/manual/process/mainwindow.h2
-rw-r--r--tests/manual/progressmanager/main.cpp2
-rw-r--r--tests/manual/progressmanager/roundprogress.cpp2
-rw-r--r--tests/manual/progressmanager/roundprogress.h2
-rw-r--r--tests/manual/proparser/main.cpp2
-rw-r--r--tests/manual/ssh/errorhandling/main.cpp2
-rw-r--r--tests/manual/ssh/remoteprocess/argumentscollector.cpp2
-rw-r--r--tests/manual/ssh/remoteprocess/argumentscollector.h2
-rw-r--r--tests/manual/ssh/remoteprocess/main.cpp2
-rw-r--r--tests/manual/ssh/remoteprocess/remoteprocesstest.cpp2
-rw-r--r--tests/manual/ssh/remoteprocess/remoteprocesstest.h2
-rw-r--r--tests/manual/ssh/sftp/argumentscollector.cpp2
-rw-r--r--tests/manual/ssh/sftp/argumentscollector.h2
-rw-r--r--tests/manual/ssh/sftp/main.cpp2
-rw-r--r--tests/manual/ssh/sftp/parameters.h2
-rw-r--r--tests/manual/ssh/sftp/sftptest.cpp2
-rw-r--r--tests/manual/ssh/sftp/sftptest.h2
-rw-r--r--tests/tools/codaclient/codaclientapplication.cpp2
-rw-r--r--tests/tools/codaclient/codaclientapplication.h2
-rw-r--r--tests/tools/codaclient/main.cpp2
-rw-r--r--tests/tools/cplusplus-dump/dumpers.inc2
-rw-r--r--tests/tools/cplusplus-dump/main.cpp2
-rw-r--r--tests/tools/qml-ast2dot/main.cpp2
-rw-r--r--tests/tools/qtquickappblaster/main.cpp2
-rw-r--r--tests/valgrind/callgrind/callgrindparsertests.cpp4
-rw-r--r--tests/valgrind/callgrind/callgrindparsertests.h4
-rw-r--r--tests/valgrind/callgrind/modeltest.cpp4
-rw-r--r--tests/valgrind/callgrind/modeltest.h2
-rw-r--r--tests/valgrind/memcheck/modeldemo.cpp2
-rw-r--r--tests/valgrind/memcheck/modeldemo.h2
-rw-r--r--tests/valgrind/memcheck/testrunner.cpp2
-rw-r--r--tests/valgrind/memcheck/testrunner.h2
135 files changed, 139 insertions, 139 deletions
diff --git a/tests/auto/aggregation/tst_aggregate.cpp b/tests/auto/aggregation/tst_aggregate.cpp
index 8126c635524..d7842346e24 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 00178e97a1d..c8626f51916 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 f5aea49a853..35f55e26c19 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 9dbe5506a71..fedea8c9095 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 78ffdfa6773..158669db0b4 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 fe73b54bdb7..d99988ae9e3 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 347ebd4d6de..baabd04624d 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 3e465aff05f..b814992b8dc 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 98a6dbdd9de..b6697e69074 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 5780ac49102..144b87242a9 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 bc1289a28d7..361a97e47fe 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 e2cfa8d85ad..1ab85cfd55e 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 0364e70b33a..9471b230bc2 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 1d2cca0016c..7586540bf0c 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 dee60eedbf0..75d91a19cdb 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 bf9a260685c..171eab7238f 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 814fd139aa3..f116b5c6d32 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 0a6cac61437..529455f888e 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 cd53d96a5de..ee20164a1cb 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 df6aa752e67..5ee45d58fe1 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 f1da14bd4f6..ee7dbec1203 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 75277b318d8..3ee0d5c3995 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 ff3a35522bc..f146f0ad0f9 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 987196fe948..58d9777c236 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 c1c38e3a697..44e41a02c3e 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 4ba3b35b57e..b2e9217517c 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 b87dfa41aa0..a21d83fa8f7 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 816295a3053..c6e6a4ef92c 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 fc7c2d7ad9d..697496fdfc0 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 acbd4c2f37f..c8d31230cd6 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 1bcc08076e4..0837588b8be 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 519867fc0a1..718f530dfbe 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 c1df40de1f4..123ca6d0b55 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 1192d863e93..c0bf411f393 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 5d8b36c045e..080013e04a1 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 50ff40f782b..ceb7dec1b2d 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 854acf893f4..ec0d8b7109c 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 81823697ec1..dddc7abce76 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 a1e5ed8e940..078aa3a8f30 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 de36ba328cd..f085c826265 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 00243c13bb0..34082947e38 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 40f63ee22c6..9a20f3641a2 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 24ae2376bc3..2c6a8932d84 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 e5e97f4d6f5..e270ee02974 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 0d6e186a0a0..22aefc106bb 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 ba0f678398e..8c692f9675d 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 6801dd96160..d46d22c97b7 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 feda22ae05e..1ee0769c657 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 f00154d0ee8..ee8cb2b168d 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 0f765b165c6..7a55da291d4 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 91ea659999c..8783fc32a76 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 aad0204acba..5d0a374ead4 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 94df6bbddef..b9d175dd124 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 782058f66ab..c9fca2e652e 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 c4b062fb83d..8f8d5ad26c5 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 cd0eb6058eb..287d60221dc 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 f9ddd5fd038..f0f96aa571f 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 f142393dbd0..1748cdbb64c 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 cef95e1690c..e60c8b76bdf 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 61167e75a63..5bf79e57ce9 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 cb0dd7f1732..1927bf5b27a 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 0d041f46308..235fb40fe22 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 3851ac77a02..e445e27cf63 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 30c79767e87..6039fc2489a 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 d03593fba89..f45f35ef68d 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 7ec4e8747da..4977c88ee51 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 c89018e65c7..ea326182bc8 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 35b0d134338..d8d9dbb59c2 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 270e286561d..f6d372f7b90 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 1c548b1ded1..ddd636df213 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 2f8b7c81a80..f6b1a8a5ba0 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 464caaf5557..8926bff0d61 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 37a7a6ef871..c4858a88d6a 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 99ae65de0e1..72a50dd98a9 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 c1edc824d4e..e820a14a2a9 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 190bd2e67d5..e87e4443765 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 421332a1a3b..a898f9b66a5 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 75ab889991b..fddb143a38c 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 fcf173f052c..6f8286eed9e 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 22576e6781e..55bf4f0e51e 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 ea305d91e37..3521ab0458e 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 9b7dfd96b72..eacd29d05c9 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 3e83a3a687e..b146ee3a968 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 a0f9c7f1aea..491779d1312 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 5bffac268ee..46f33b9723f 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 a9aa5895ae6..104671b994a 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 d46535e587e..2a7479e4235 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 27505e9f1e6..e537b0db970 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 bd2771fdbe8..72139b4c27a 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 28b152876f7..60462b8343d 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 0fe9c7b81e8..975d64f2a6c 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 c490f0b4193..4f3379114d1 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 d1e8cb03e07..535a22c40f2 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 7b0ee3781de..f94dd73a46a 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 ea9498d51ee..4b2b81c0f74 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 7b0ee3781de..5048b41d187 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 ea9498d51ee..4b2b81c0f74 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 180cce83e7b..d857a6e2c4e 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 e4c1c48e758..512f6850cc7 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 443397b6569..78039deab36 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 15ef5f5c715..a90ce47f9ca 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 beecc16b28a..bc1bb5e4807 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 9ed451832b6..f88ca43b598 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 5cc48432a37..e3dacb25507 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 a45c87e39e8..83896f55fa1 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 22449cbdf10..b116c2be707 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 43f638e13d7..dbc5d636c55 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 aec72921224..fb1543557f3 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 c4308c8d0f3..b67c1b5951c 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 8ba66d7ea34..73e348b1e2c 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 473852cefa0..6efdb0d1a73 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 89ea6c5c2e8..747ee32f2b4 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 cb1f489ed46..854caadea29 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 6163f66f000..d990379df04 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 369f0c6fa40..2bb59725963 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 ad0d44f482b..460fe2df52c 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 be362916562..51d5d8a70b7 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 66a364bc3d1..70372f7ad44 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 077ddc19c37..aab3cb2e670 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 34c6607c0d3..c1a093adc2c 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 62a55385d4c..b6667b4f1b9 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 6bed1c99399..88beb596b8f 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 80487ab5aa0..0c6ba42e69c 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 c97824eb3d6..507ef64a5f9 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 7fb910f0f2a..861b98528ee 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 a49250709b4..8c77249d449 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 36e58195064..0b235e1942b 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 73a6c8bd4d1..b1e6a8db9f8 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 545c77f4356..a63a05f4431 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 53030f8c6b3..d6ec5f1d1f5 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 0a6e181c17e..1f93af1aa32 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 a5cf21d24b9..fdaac18046b 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 0f6fcb47604..135535e3caa 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 2618f73924f..c063e5227eb 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 3f8efe029ca..36218c56841 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.
**
**************************************************************************/