diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-11-11 09:46:01 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-11-11 09:46:25 +0100 |
| commit | 85cf2b661e668d20a56f649b118d6bdc713477e4 (patch) | |
| tree | 4dfb59750827bb34ea566dae6c637a17577cf974 /tests | |
| parent | 920ed1140edab10f8fa6d40974cd6ad4fed55c85 (diff) | |
| parent | d099d6856ee2b259923201b384ff58b75f2c358e (diff) | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
src/libs/qmljs/qmljsinterpreter.cpp
src/libs/qmljs/qmljsinterpreter.h
src/plugins/debugger/qml/scriptconsole.cpp
src/plugins/git/gitplugin.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h
Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
Diffstat (limited to 'tests')
202 files changed, 441 insertions, 474 deletions
diff --git a/tests/auto/aggregation/tst_aggregate.cpp b/tests/auto/aggregation/tst_aggregate.cpp index d7842346e2..4b567bebae 100644 --- a/tests/auto/aggregation/tst_aggregate.cpp +++ b/tests/auto/aggregation/tst_aggregate.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/changeset/tst_changeset.cpp b/tests/auto/changeset/tst_changeset.cpp index c8626f5191..abe4e78179 100644 --- a/tests/auto/changeset/tst_changeset.cpp +++ b/tests/auto/changeset/tst_changeset.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp index 35f55e26c1..b7854d7042 100644 --- a/tests/auto/cplusplus/ast/tst_ast.cpp +++ b/tests/auto/cplusplus/ast/tst_ast.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp index c142f7cf3d..bff1511ac0 100644 --- a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp +++ b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/codegen/tst_codegen.cpp b/tests/auto/cplusplus/codegen/tst_codegen.cpp index 1044843ed3..e1425f7cbe 100644 --- a/tests/auto/cplusplus/codegen/tst_codegen.cpp +++ b/tests/auto/cplusplus/codegen/tst_codegen.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/findusages/tst_findusages.cpp b/tests/auto/cplusplus/findusages/tst_findusages.cpp index d99988ae9e..912e20aa6b 100644 --- a/tests/auto/cplusplus/findusages/tst_findusages.cpp +++ b/tests/auto/cplusplus/findusages/tst_findusages.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/lookup/tst_lookup.cpp b/tests/auto/cplusplus/lookup/tst_lookup.cpp index baabd04624..570b386c88 100644 --- a/tests/auto/cplusplus/lookup/tst_lookup.cpp +++ b/tests/auto/cplusplus/lookup/tst_lookup.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/misc/tst_misc.cpp b/tests/auto/cplusplus/misc/tst_misc.cpp index b4390d4502..666f47bbae 100644 --- a/tests/auto/cplusplus/misc/tst_misc.cpp +++ b/tests/auto/cplusplus/misc/tst_misc.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp index b6697e6907..b2d17e2156 100644 --- a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp +++ b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp index 144b87242a..3db5211b75 100644 --- a/tests/auto/cplusplus/semantic/tst_semantic.cpp +++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp b/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp index 361a97e47f..3927824812 100644 --- a/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp +++ b/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp b/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp index d1d1e2f5b9..0bb4ec4700 100644 --- a/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp +++ b/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 81eaeb8f62..42427202f9 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp index 7586540bf0..bc1dd1b809 100644 --- a/tests/auto/debugger/tst_gdb.cpp +++ b/tests/auto/debugger/tst_gdb.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/debugger/tst_version.cpp b/tests/auto/debugger/tst_version.cpp index 75d91a19cd..984abcadb9 100644 --- a/tests/auto/debugger/tst_version.cpp +++ b/tests/auto/debugger/tst_version.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/environment/tst_environment.cpp b/tests/auto/environment/tst_environment.cpp index 171eab7238..93588c16b4 100644 --- a/tests/auto/environment/tst_environment.cpp +++ b/tests/auto/environment/tst_environment.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp index f116b5c6d3..2c6895ab36 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h index 529455f888..3f027d02aa 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp index ee20164a1c..3ab3065f55 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h index 5ee45d58fe..873dc7a074 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp index ee7dbec120..95b8e166f0 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@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 3ee0d5c399..52247b24ad 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp index f146f0ad0f..4db614c722 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h index 58d9777c23..09670c1c13 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp index 44e41a02c3..1bf1dfaf8f 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h index b2e9217517..8046dbcfe9 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp index a21d83fa8f..1568023f8d 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h index c6e6a4ef92..61b1831c5a 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ #ifndef PLUGIN3_H diff --git a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp index 697496fdfc..ef459738f6 100644 --- a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp +++ b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp index c8d31230cd..f79f022ff7 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp +++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h index 0837588b8b..b3e77c720b 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h +++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h index 718f530dfb..a76240b2b6 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h +++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp index 123ca6d0b5..a01323f073 100644 --- a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp +++ b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/externaltool/tst_externaltooltest.cpp b/tests/auto/externaltool/tst_externaltooltest.cpp index 0dc684dfd5..6019a20f9f 100644 --- a/tests/auto/externaltool/tst_externaltooltest.cpp +++ b/tests/auto/externaltool/tst_externaltooltest.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/fakevim/tst_fakevim.cpp b/tests/auto/fakevim/tst_fakevim.cpp index 2eed029e72..a8d26316b5 100644 --- a/tests/auto/fakevim/tst_fakevim.cpp +++ b/tests/auto/fakevim/tst_fakevim.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/filesearch/tst_filesearch.cpp b/tests/auto/filesearch/tst_filesearch.cpp index 2b283bc1f3..a66d27b463 100644 --- a/tests/auto/filesearch/tst_filesearch.cpp +++ b/tests/auto/filesearch/tst_filesearch.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/basetextdocumentlayout.h b/tests/auto/generichighlighter/highlighterengine/basetextdocumentlayout.h index ceb7dec1b2..ceb3841f39 100644 --- a/tests/auto/generichighlighter/highlighterengine/basetextdocumentlayout.h +++ b/tests/auto/generichighlighter/highlighterengine/basetextdocumentlayout.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/formats.cpp b/tests/auto/generichighlighter/highlighterengine/formats.cpp index ec0d8b7109..bc007a51ad 100644 --- a/tests/auto/generichighlighter/highlighterengine/formats.cpp +++ b/tests/auto/generichighlighter/highlighterengine/formats.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/formats.h b/tests/auto/generichighlighter/highlighterengine/formats.h index dddc7abce7..e6be210295 100644 --- a/tests/auto/generichighlighter/highlighterengine/formats.h +++ b/tests/auto/generichighlighter/highlighterengine/formats.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp b/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp index 891a7ec334..46ec4e95bd 100644 --- a/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp +++ b/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/highlightermock.h b/tests/auto/generichighlighter/highlighterengine/highlightermock.h index f085c82626..17ce0c3abf 100644 --- a/tests/auto/generichighlighter/highlighterengine/highlightermock.h +++ b/tests/auto/generichighlighter/highlighterengine/highlightermock.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h index 34082947e3..d6929ef50d 100644 --- a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h +++ b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/tabsettings.h b/tests/auto/generichighlighter/highlighterengine/tabsettings.h index 9a20f3641a..9788291ecc 100644 --- a/tests/auto/generichighlighter/highlighterengine/tabsettings.h +++ b/tests/auto/generichighlighter/highlighterengine/tabsettings.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp b/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp index 2c6a8932d8..e76a296d14 100644 --- a/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp +++ b/tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp b/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp index e270ee0297..2b598c24d7 100644 --- a/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp +++ b/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/icheckbuild/ichecklib.cpp b/tests/auto/icheckbuild/ichecklib.cpp index 22aefc106b..213bc0c8f0 100644 --- a/tests/auto/icheckbuild/ichecklib.cpp +++ b/tests/auto/icheckbuild/ichecklib.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** GNU Lesser General Public License Usage ** @@ -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 info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/icheckbuild/ichecklib.h b/tests/auto/icheckbuild/ichecklib.h index 8c692f9675..39450832cf 100644 --- a/tests/auto/icheckbuild/ichecklib.h +++ b/tests/auto/icheckbuild/ichecklib.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** GNU Lesser General Public License Usage ** @@ -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 info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/icheckbuild/ichecklib_global.h b/tests/auto/icheckbuild/ichecklib_global.h index d46d22c97b..775da3540b 100644 --- a/tests/auto/icheckbuild/ichecklib_global.h +++ b/tests/auto/icheckbuild/ichecklib_global.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** GNU Lesser General Public License Usage ** @@ -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 info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/icheckbuild/parsemanager.cpp b/tests/auto/icheckbuild/parsemanager.cpp index 1ee0769c65..414e7efd7b 100644 --- a/tests/auto/icheckbuild/parsemanager.cpp +++ b/tests/auto/icheckbuild/parsemanager.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/icheckbuild/parsemanager.h b/tests/auto/icheckbuild/parsemanager.h index ee8cb2b168..7b2c50ef68 100644 --- a/tests/auto/icheckbuild/parsemanager.h +++ b/tests/auto/icheckbuild/parsemanager.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/icheckbuild/tst_icheckbuild.cpp b/tests/auto/icheckbuild/tst_icheckbuild.cpp index 7a55da291d..e192b05cc6 100644 --- a/tests/auto/icheckbuild/tst_icheckbuild.cpp +++ b/tests/auto/icheckbuild/tst_icheckbuild.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/ioutils/tst_ioutils.cpp b/tests/auto/ioutils/tst_ioutils.cpp index 8783fc32a7..5bdde34132 100644 --- a/tests/auto/ioutils/tst_ioutils.cpp +++ b/tests/auto/ioutils/tst_ioutils.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/profilewriter/tst_profilewriter.cpp b/tests/auto/profilewriter/tst_profilewriter.cpp index 5d0a374ead..1b86d692d0 100644 --- a/tests/auto/profilewriter/tst_profilewriter.cpp +++ b/tests/auto/profilewriter/tst_profilewriter.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/codemodel/basic/tst_basic.cpp b/tests/auto/qml/codemodel/basic/tst_basic.cpp index 4706daba01..b4fa73d990 100644 --- a/tests/auto/qml/codemodel/basic/tst_basic.cpp +++ b/tests/auto/qml/codemodel/basic/tst_basic.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/codemodel/check/tst_check.cpp b/tests/auto/qml/codemodel/check/tst_check.cpp index 43939155e6..68c0cbb600 100644 --- a/tests/auto/qml/codemodel/check/tst_check.cpp +++ b/tests/auto/qml/codemodel/check/tst_check.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.cpp b/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.cpp index c9fca2e652..497284cb84 100644 --- a/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.cpp +++ b/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.h b/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.h index 8f8d5ad26c..2270854a84 100644 --- a/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.h +++ b/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/common/statichelpers.cpp b/tests/auto/qml/qmldesigner/common/statichelpers.cpp index 287d60221d..c16b400e05 100644 --- a/tests/auto/qml/qmldesigner/common/statichelpers.cpp +++ b/tests/auto/qml/qmldesigner/common/statichelpers.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp b/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp index f0f96aa571..93deb04ff6 100644 --- a/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp +++ b/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/coretests/testrewriterview.h b/tests/auto/qml/qmldesigner/coretests/testrewriterview.h index 1748cdbb64..426012cdde 100644 --- a/tests/auto/qml/qmldesigner/coretests/testrewriterview.h +++ b/tests/auto/qml/qmldesigner/coretests/testrewriterview.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index e60c8b76bd..80b63ce418 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.h b/tests/auto/qml/qmldesigner/coretests/tst_testcore.h index 5bf79e57ce..0ea89cf341 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.h +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/MyButton.qml b/tests/auto/qml/qmldesigner/data/fx/MyButton.qml index f083acad63..2458220395 100644 --- a/tests/auto/qml/qmldesigner/data/fx/MyButton.qml +++ b/tests/auto/qml/qmldesigner/data/fx/MyButton.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/TabWidget.qml b/tests/auto/qml/qmldesigner/data/fx/TabWidget.qml index c754d692c8..684f66c079 100644 --- a/tests/auto/qml/qmldesigner/data/fx/TabWidget.qml +++ b/tests/auto/qml/qmldesigner/data/fx/TabWidget.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/attributes.qml b/tests/auto/qml/qmldesigner/data/fx/attributes.qml index 1ced49f30f..c32097bd77 100644 --- a/tests/auto/qml/qmldesigner/data/fx/attributes.qml +++ b/tests/auto/qml/qmldesigner/data/fx/attributes.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/bigtest.qml b/tests/auto/qml/qmldesigner/data/fx/bigtest.qml index dd08059daa..2ad096f3e3 100644 --- a/tests/auto/qml/qmldesigner/data/fx/bigtest.qml +++ b/tests/auto/qml/qmldesigner/data/fx/bigtest.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/components.qml b/tests/auto/qml/qmldesigner/data/fx/components.qml index b2db395691..7a9681d7b7 100644 --- a/tests/auto/qml/qmldesigner/data/fx/components.qml +++ b/tests/auto/qml/qmldesigner/data/fx/components.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/empty.qml b/tests/auto/qml/qmldesigner/data/fx/empty.qml index 97ce134d96..86676f2d5e 100644 --- a/tests/auto/qml/qmldesigner/data/fx/empty.qml +++ b/tests/auto/qml/qmldesigner/data/fx/empty.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/helloworld.qml b/tests/auto/qml/qmldesigner/data/fx/helloworld.qml index 9e906f58d8..8ea08165cb 100644 --- a/tests/auto/qml/qmldesigner/data/fx/helloworld.qml +++ b/tests/auto/qml/qmldesigner/data/fx/helloworld.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/image.qml b/tests/auto/qml/qmldesigner/data/fx/image.qml index 45891aed3c..b129a808ff 100644 --- a/tests/auto/qml/qmldesigner/data/fx/image.qml +++ b/tests/auto/qml/qmldesigner/data/fx/image.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/imports.qml b/tests/auto/qml/qmldesigner/data/fx/imports.qml index bdef719dbf..75e8d97757 100644 --- a/tests/auto/qml/qmldesigner/data/fx/imports.qml +++ b/tests/auto/qml/qmldesigner/data/fx/imports.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/properties.qml b/tests/auto/qml/qmldesigner/data/fx/properties.qml index a937a61712..9d48ccced3 100644 --- a/tests/auto/qml/qmldesigner/data/fx/properties.qml +++ b/tests/auto/qml/qmldesigner/data/fx/properties.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/selectiontest.qml b/tests/auto/qml/qmldesigner/data/fx/selectiontest.qml index 9d8941d3cc..5ffe52395a 100644 --- a/tests/auto/qml/qmldesigner/data/fx/selectiontest.qml +++ b/tests/auto/qml/qmldesigner/data/fx/selectiontest.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/states.qml b/tests/auto/qml/qmldesigner/data/fx/states.qml index 932f8c5891..eb60877d20 100644 --- a/tests/auto/qml/qmldesigner/data/fx/states.qml +++ b/tests/auto/qml/qmldesigner/data/fx/states.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/subitems/SubItem.qml b/tests/auto/qml/qmldesigner/data/fx/subitems/SubItem.qml index 297a4e1223..a00aaac74a 100644 --- a/tests/auto/qml/qmldesigner/data/fx/subitems/SubItem.qml +++ b/tests/auto/qml/qmldesigner/data/fx/subitems/SubItem.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/tabs.qml b/tests/auto/qml/qmldesigner/data/fx/tabs.qml index c795acbc0b..f85d2bd75a 100644 --- a/tests/auto/qml/qmldesigner/data/fx/tabs.qml +++ b/tests/auto/qml/qmldesigner/data/fx/tabs.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/topitem.qml b/tests/auto/qml/qmldesigner/data/fx/topitem.qml index 829763bdb7..3393623a27 100644 --- a/tests/auto/qml/qmldesigner/data/fx/topitem.qml +++ b/tests/auto/qml/qmldesigner/data/fx/topitem.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/usingbutton.qml b/tests/auto/qml/qmldesigner/data/fx/usingbutton.qml index e479e24f82..7c4674c99d 100644 --- a/tests/auto/qml/qmldesigner/data/fx/usingbutton.qml +++ b/tests/auto/qml/qmldesigner/data/fx/usingbutton.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/fx/usingmybutton.qml b/tests/auto/qml/qmldesigner/data/fx/usingmybutton.qml index 6c1685575a..c6f2e9c6de 100644 --- a/tests/auto/qml/qmldesigner/data/fx/usingmybutton.qml +++ b/tests/auto/qml/qmldesigner/data/fx/usingmybutton.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/data/qwidget/test.qml b/tests/auto/qml/qmldesigner/data/qwidget/test.qml index 88149ff377..16d29188be 100644 --- a/tests/auto/qml/qmldesigner/data/qwidget/test.qml +++ b/tests/auto/qml/qmldesigner/data/qwidget/test.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp index 1927bf5b27..b23b328104 100644 --- a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp +++ b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.h b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.h index 235fb40fe2..d60aacd045 100644 --- a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.h +++ b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/testview.cpp b/tests/auto/qml/qmldesigner/testview.cpp index e445e27cf6..750a8e5198 100644 --- a/tests/auto/qml/qmldesigner/testview.cpp +++ b/tests/auto/qml/qmldesigner/testview.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmldesigner/testview.h b/tests/auto/qml/qmldesigner/testview.h index 6039fc2489..7df097a1fb 100644 --- a/tests/auto/qml/qmldesigner/testview.h +++ b/tests/auto/qml/qmldesigner/testview.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp b/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp index df504ad738..22d69c0f3d 100644 --- a/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp +++ b/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmleditor/qmllookup/data/localIdLookup.qml b/tests/auto/qml/qmleditor/qmllookup/data/localIdLookup.qml index 21306674db..3eb12b62ea 100644 --- a/tests/auto/qml/qmleditor/qmllookup/data/localIdLookup.qml +++ b/tests/auto/qml/qmleditor/qmllookup/data/localIdLookup.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmleditor/qmllookup/data/localRootLookup.qml b/tests/auto/qml/qmleditor/qmllookup/data/localRootLookup.qml index 6b74e4e0d0..b3fb122d29 100644 --- a/tests/auto/qml/qmleditor/qmllookup/data/localRootLookup.qml +++ b/tests/auto/qml/qmleditor/qmllookup/data/localRootLookup.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmleditor/qmllookup/data/localScopeLookup.qml b/tests/auto/qml/qmleditor/qmllookup/data/localScopeLookup.qml index a339300bdb..7c95f87a79 100644 --- a/tests/auto/qml/qmleditor/qmllookup/data/localScopeLookup.qml +++ b/tests/auto/qml/qmleditor/qmllookup/data/localScopeLookup.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmleditor/qmllookup/data/localScriptMethodLookup.qml b/tests/auto/qml/qmleditor/qmllookup/data/localScriptMethodLookup.qml index a368ab6a57..fce6c404ca 100644 --- a/tests/auto/qml/qmleditor/qmllookup/data/localScriptMethodLookup.qml +++ b/tests/auto/qml/qmleditor/qmllookup/data/localScriptMethodLookup.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmleditor/qmllookup/tst_qmllookup.cpp b/tests/auto/qml/qmleditor/qmllookup/tst_qmllookup.cpp index 4977c88ee5..8db3a57c90 100644 --- a/tests/auto/qml/qmleditor/qmllookup/tst_qmllookup.cpp +++ b/tests/auto/qml/qmleditor/qmllookup/tst_qmllookup.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp index ea326182bc..ecfd3aa235 100644 --- a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp +++ b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/qtcprocess/tst_qtcprocess.cpp b/tests/auto/qtcprocess/tst_qtcprocess.cpp index d8d9dbb59c..2f3302aca7 100644 --- a/tests/auto/qtcprocess/tst_qtcprocess.cpp +++ b/tests/auto/qtcprocess/tst_qtcprocess.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/auto/utils_stringutils/tst_stringutils.cpp b/tests/auto/utils_stringutils/tst_stringutils.cpp index f6d372f7b9..cceacaca5a 100644 --- a/tests/auto/utils_stringutils/tst_stringutils.cpp +++ b/tests/auto/utils_stringutils/tst_stringutils.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/appwizards/helpers.cpp b/tests/manual/appwizards/helpers.cpp index 7773fa95a2..6e9a65a665 100644 --- a/tests/manual/appwizards/helpers.cpp +++ b/tests/manual/appwizards/helpers.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/appwizards/main.cpp b/tests/manual/appwizards/main.cpp index f6b1a8a5ba..08ea79784d 100644 --- a/tests/manual/appwizards/main.cpp +++ b/tests/manual/appwizards/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/appwizards/qmlimportscenario_01/myqmlapp.qml b/tests/manual/appwizards/qmlimportscenario_01/myqmlapp.qml index bc96ad0381..0323717eec 100644 --- a/tests/manual/appwizards/qmlimportscenario_01/myqmlapp.qml +++ b/tests/manual/appwizards/qmlimportscenario_01/myqmlapp.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/appwizards/qmlimportscenario_01/qmlproject01/QmlProject01.qml b/tests/manual/appwizards/qmlimportscenario_01/qmlproject01/QmlProject01.qml index 005056518a..a042543429 100644 --- a/tests/manual/appwizards/qmlimportscenario_01/qmlproject01/QmlProject01.qml +++ b/tests/manual/appwizards/qmlimportscenario_01/qmlproject01/QmlProject01.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/appwizards/qmlimportscenario_01/qmlproject02/QmlProject02.qml b/tests/manual/appwizards/qmlimportscenario_01/qmlproject02/QmlProject02.qml index e79d4c0b55..1053828bae 100644 --- a/tests/manual/appwizards/qmlimportscenario_01/qmlproject02/QmlProject02.qml +++ b/tests/manual/appwizards/qmlimportscenario_01/qmlproject02/QmlProject02.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/appwizards/qmlimportscenario_02/subfolder1/myqmlapp.qml b/tests/manual/appwizards/qmlimportscenario_02/subfolder1/myqmlapp.qml index bc96ad0381..0323717eec 100644 --- a/tests/manual/appwizards/qmlimportscenario_02/subfolder1/myqmlapp.qml +++ b/tests/manual/appwizards/qmlimportscenario_02/subfolder1/myqmlapp.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/appwizards/qmlimportscenario_02/subfolder2/no/trolltech/QmlModule01/QmlComponent01.qml b/tests/manual/appwizards/qmlimportscenario_02/subfolder2/no/trolltech/QmlModule01/QmlComponent01.qml index 140e7aa8f2..41cfc58e4e 100644 --- a/tests/manual/appwizards/qmlimportscenario_02/subfolder2/no/trolltech/QmlModule01/QmlComponent01.qml +++ b/tests/manual/appwizards/qmlimportscenario_02/subfolder2/no/trolltech/QmlModule01/QmlComponent01.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/appwizards/qmlimportscenario_02/subfolder3/com/nokia/QmlModule02/QmlComponent02.qml b/tests/manual/appwizards/qmlimportscenario_02/subfolder3/com/nokia/QmlModule02/QmlComponent02.qml index 0cefc4c5b9..2f7ed8c597 100644 --- a/tests/manual/appwizards/qmlimportscenario_02/subfolder3/com/nokia/QmlModule02/QmlComponent02.qml +++ b/tests/manual/appwizards/qmlimportscenario_02/subfolder3/com/nokia/QmlModule02/QmlComponent02.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-frontend/main.cpp b/tests/manual/cplusplus-frontend/main.cpp index 8926bff0d6..f678cedba4 100644 --- a/tests/manual/cplusplus-frontend/main.cpp +++ b/tests/manual/cplusplus-frontend/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-frontend/tests/t1.cpp b/tests/manual/cplusplus-frontend/tests/t1.cpp index c4858a88d6..131204fceb 100644 --- a/tests/manual/cplusplus-frontend/tests/t1.cpp +++ b/tests/manual/cplusplus-frontend/tests/t1.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-tools/detail/header.h b/tests/manual/cplusplus-tools/detail/header.h index 72a50dd98a..15eb6700f8 100644 --- a/tests/manual/cplusplus-tools/detail/header.h +++ b/tests/manual/cplusplus-tools/detail/header.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-tools/detail/source.cpp b/tests/manual/cplusplus-tools/detail/source.cpp index e820a14a2a..1b552ec0e8 100644 --- a/tests/manual/cplusplus-tools/detail/source.cpp +++ b/tests/manual/cplusplus-tools/detail/source.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-tools/dummy.cpp b/tests/manual/cplusplus-tools/dummy.cpp index e87e444376..4f560b1506 100644 --- a/tests/manual/cplusplus-tools/dummy.cpp +++ b/tests/manual/cplusplus-tools/dummy.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-tools/dummy.h b/tests/manual/cplusplus-tools/dummy.h index a898f9b66a..351839eb19 100644 --- a/tests/manual/cplusplus-tools/dummy.h +++ b/tests/manual/cplusplus-tools/dummy.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cplusplus-tools/main.cpp b/tests/manual/cplusplus-tools/main.cpp index fddb143a38..fd94a4dfaf 100644 --- a/tests/manual/cplusplus-tools/main.cpp +++ b/tests/manual/cplusplus-tools/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cppquickfix/completeswitchcasestatement.cpp b/tests/manual/cppquickfix/completeswitchcasestatement.cpp index 6f8286eed9..db0a594bb7 100644 --- a/tests/manual/cppquickfix/completeswitchcasestatement.cpp +++ b/tests/manual/cppquickfix/completeswitchcasestatement.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/cppquickfix/convertnumericliteral.cpp b/tests/manual/cppquickfix/convertnumericliteral.cpp index 55bf4f0e51..cc2a7760e5 100644 --- a/tests/manual/cppquickfix/convertnumericliteral.cpp +++ b/tests/manual/cppquickfix/convertnumericliteral.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/debugger/boost/main.cpp b/tests/manual/debugger/boost/main.cpp index 46f33b9723..8d3dbe607c 100644 --- a/tests/manual/debugger/boost/main.cpp +++ b/tests/manual/debugger/boost/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/debugger/gui/mainwindow.cpp b/tests/manual/debugger/gui/mainwindow.cpp index 104671b994..66263f7d1c 100644 --- a/tests/manual/debugger/gui/mainwindow.cpp +++ b/tests/manual/debugger/gui/mainwindow.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/debugger/gui/mainwindow.h b/tests/manual/debugger/gui/mainwindow.h index dc1fe89796..ad64756bf0 100644 --- a/tests/manual/debugger/gui/mainwindow.h +++ b/tests/manual/debugger/gui/mainwindow.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/debugger/gui/tst_gui.cpp b/tests/manual/debugger/gui/tst_gui.cpp index 73dd36c442..fd9f4e5394 100644 --- a/tests/manual/debugger/gui/tst_gui.cpp +++ b/tests/manual/debugger/gui/tst_gui.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/debugger/helper/main.cpp b/tests/manual/debugger/helper/main.cpp index 72139b4c27..0499f0d533 100644 --- a/tests/manual/debugger/helper/main.cpp +++ b/tests/manual/debugger/helper/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/debugger/script/math.js b/tests/manual/debugger/script/math.js index 60462b8343..f2234821d0 100644 --- a/tests/manual/debugger/script/math.js +++ b/tests/manual/debugger/script/math.js @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/debugger/simple/deep/deep/simple_test_app.h b/tests/manual/debugger/simple/deep/deep/simple_test_app.h index 89a08be2a9..94f06ba64b 100644 --- a/tests/manual/debugger/simple/deep/deep/simple_test_app.h +++ b/tests/manual/debugger/simple/deep/deep/simple_test_app.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index c3c72b5d79..85ceaa2272 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ @@ -174,7 +174,7 @@ void dummyStatement(...) {} #endif #if USE_AUTOBREAK -# if Q_CC_MSVC +# ifdef Q_CC_MSVC # define BREAK_HERE __asm { int 3 }; __asm { mov eax, eax } # else # define BREAK_HERE asm("int $3; mov %eax, %eax") @@ -184,7 +184,7 @@ void dummyStatement(...) {} #endif #if USE_UNINITIALIZED_AUTOBREAK -# if Q_CC_MSVC +# ifdef Q_CC_MSVC # define BREAK_UNINITIALIZED_HERE __asm { int 3 }; __asm { mov eax, eax } # else # define BREAK_UNINITIALIZED_HERE asm("int $3; mov %eax, %eax") diff --git a/tests/manual/debugger/simple/simple_test_plugin.cpp b/tests/manual/debugger/simple/simple_test_plugin.cpp index 535a22c40f..150a8b2f51 100644 --- a/tests/manual/debugger/simple/simple_test_plugin.cpp +++ b/tests/manual/debugger/simple/simple_test_plugin.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/debugger/spacy path/app with space.cpp b/tests/manual/debugger/spacy path/app with space.cpp index f94dd73a46..feeb7eb5dd 100644 --- a/tests/manual/debugger/spacy path/app with space.cpp +++ b/tests/manual/debugger/spacy path/app with space.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** GNU Lesser General Public License Usage ** @@ -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 info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/debugger/spacy path/plugin with space.cpp b/tests/manual/debugger/spacy path/plugin with space.cpp index 4b2b81c0f7..52247467a1 100644 --- a/tests/manual/debugger/spacy path/plugin with space.cpp +++ b/tests/manual/debugger/spacy path/plugin with space.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** GNU Lesser General Public License Usage ** @@ -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 info@qt.nokia.com +** Nokia at qt-info@nokia.com ** **************************************************************************/ diff --git a/tests/manual/debugger/spacy-file/app with space.cpp b/tests/manual/debugger/spacy-file/app with space.cpp index 5048b41d18..f15df16d56 100644 --- a/tests/manual/debugger/spacy-file/app with space.cpp +++ b/tests/manual/debugger/spacy-file/app with space.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** GNU Lesser General Public License Usage ** @@ -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 info@qt.nokia.com +** Nokia at qt-info@nokia.com ** **************************************************************************/ diff --git a/tests/manual/debugger/spacy-file/plugin with space.cpp b/tests/manual/debugger/spacy-file/plugin with space.cpp index 4b2b81c0f7..52247467a1 100644 --- a/tests/manual/debugger/spacy-file/plugin with space.cpp +++ b/tests/manual/debugger/spacy-file/plugin with space.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** GNU Lesser General Public License Usage ** @@ -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 info@qt.nokia.com +** Nokia at qt-info@nokia.com ** **************************************************************************/ diff --git a/tests/manual/dockwidgets/main.cpp b/tests/manual/dockwidgets/main.cpp index 3521ab0458..28a173d3b8 100644 --- a/tests/manual/dockwidgets/main.cpp +++ b/tests/manual/dockwidgets/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/dockwidgets/mainwindow.cpp b/tests/manual/dockwidgets/mainwindow.cpp index eacd29d05c..fdea2abae4 100644 --- a/tests/manual/dockwidgets/mainwindow.cpp +++ b/tests/manual/dockwidgets/mainwindow.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/dockwidgets/mainwindow.h b/tests/manual/dockwidgets/mainwindow.h index b146ee3a96..88fcb5eac5 100644 --- a/tests/manual/dockwidgets/mainwindow.h +++ b/tests/manual/dockwidgets/mainwindow.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/fakevim/main.cpp b/tests/manual/fakevim/main.cpp index a808fef3d4..ad6c48103d 100644 --- a/tests/manual/fakevim/main.cpp +++ b/tests/manual/fakevim/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/plain-cplusplus/Preprocessor.cpp b/tests/manual/plain-cplusplus/Preprocessor.cpp index d857a6e2c4..e1dc9101b8 100644 --- a/tests/manual/plain-cplusplus/Preprocessor.cpp +++ b/tests/manual/plain-cplusplus/Preprocessor.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/plain-cplusplus/Preprocessor.h b/tests/manual/plain-cplusplus/Preprocessor.h index 512f6850cc..900ce62b73 100644 --- a/tests/manual/plain-cplusplus/Preprocessor.h +++ b/tests/manual/plain-cplusplus/Preprocessor.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ #ifndef CPLUSPLUS_PREPROCESSOR_H diff --git a/tests/manual/plain-cplusplus/main.cpp b/tests/manual/plain-cplusplus/main.cpp index 78039deab3..9a6c74adb5 100644 --- a/tests/manual/plain-cplusplus/main.cpp +++ b/tests/manual/plain-cplusplus/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/preprocessor/main.cpp b/tests/manual/preprocessor/main.cpp index 1f0bf4e763..bc76b4251a 100644 --- a/tests/manual/preprocessor/main.cpp +++ b/tests/manual/preprocessor/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/process/main.cpp b/tests/manual/process/main.cpp index bc1bb5e480..e58b4b970d 100644 --- a/tests/manual/process/main.cpp +++ b/tests/manual/process/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/process/mainwindow.cpp b/tests/manual/process/mainwindow.cpp index f88ca43b59..557508e3ac 100644 --- a/tests/manual/process/mainwindow.cpp +++ b/tests/manual/process/mainwindow.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** *************************************************************************/ diff --git a/tests/manual/process/mainwindow.h b/tests/manual/process/mainwindow.h index e3dacb2550..e0c1bbdaa5 100644 --- a/tests/manual/process/mainwindow.h +++ b/tests/manual/process/mainwindow.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/progressmanager/main.cpp b/tests/manual/progressmanager/main.cpp index 83896f55fa..4d46853f64 100644 --- a/tests/manual/progressmanager/main.cpp +++ b/tests/manual/progressmanager/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/progressmanager/roundprogress.cpp b/tests/manual/progressmanager/roundprogress.cpp index b116c2be70..0c16143c92 100644 --- a/tests/manual/progressmanager/roundprogress.cpp +++ b/tests/manual/progressmanager/roundprogress.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/progressmanager/roundprogress.h b/tests/manual/progressmanager/roundprogress.h index dbc5d636c5..80bfb8c706 100644 --- a/tests/manual/progressmanager/roundprogress.h +++ b/tests/manual/progressmanager/roundprogress.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/proparser/main.cpp b/tests/manual/proparser/main.cpp index fb1543557f..ff8a8cedc9 100644 --- a/tests/manual/proparser/main.cpp +++ b/tests/manual/proparser/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/qml/testfiles/components/MyButton.qml b/tests/manual/qml/testfiles/components/MyButton.qml index 64cb9b9700..e054dc715e 100644 --- a/tests/manual/qml/testfiles/components/MyButton.qml +++ b/tests/manual/qml/testfiles/components/MyButton.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/qml/testfiles/empty.qml b/tests/manual/qml/testfiles/empty.qml index 5d1706cafd..58d15e418b 100644 --- a/tests/manual/qml/testfiles/empty.qml +++ b/tests/manual/qml/testfiles/empty.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/qml/testfiles/flipable.qml b/tests/manual/qml/testfiles/flipable.qml index f85aebac83..d6e76ceb03 100644 --- a/tests/manual/qml/testfiles/flipable.qml +++ b/tests/manual/qml/testfiles/flipable.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/qml/testfiles/helloworld.qml b/tests/manual/qml/testfiles/helloworld.qml index 9e906f58d8..8ea08165cb 100644 --- a/tests/manual/qml/testfiles/helloworld.qml +++ b/tests/manual/qml/testfiles/helloworld.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/qml/testfiles/helloworld_inverted.qml b/tests/manual/qml/testfiles/helloworld_inverted.qml index 76dd0537ae..68c7737744 100644 --- a/tests/manual/qml/testfiles/helloworld_inverted.qml +++ b/tests/manual/qml/testfiles/helloworld_inverted.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/qml/testfiles/images.qml b/tests/manual/qml/testfiles/images.qml index 4ad6b7e587..b8f9a7d71b 100644 --- a/tests/manual/qml/testfiles/images.qml +++ b/tests/manual/qml/testfiles/images.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/qml/testfiles/listmodel.qml b/tests/manual/qml/testfiles/listmodel.qml index b85f678692..fb090f0bfa 100644 --- a/tests/manual/qml/testfiles/listmodel.qml +++ b/tests/manual/qml/testfiles/listmodel.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/qml/testfiles/listview.qml b/tests/manual/qml/testfiles/listview.qml index 6e302c57ed..bcf512a856 100644 --- a/tests/manual/qml/testfiles/listview.qml +++ b/tests/manual/qml/testfiles/listview.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/qml/testfiles/states.qml b/tests/manual/qml/testfiles/states.qml index 932f8c5891..eb60877d20 100644 --- a/tests/manual/qml/testfiles/states.qml +++ b/tests/manual/qml/testfiles/states.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/qml/testfiles/subcomponent.qml b/tests/manual/qml/testfiles/subcomponent.qml index 584d20beff..2aefa45d08 100644 --- a/tests/manual/qml/testfiles/subcomponent.qml +++ b/tests/manual/qml/testfiles/subcomponent.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/qml/testfiles/usingbutton.qml b/tests/manual/qml/testfiles/usingbutton.qml index e479e24f82..7c4674c99d 100644 --- a/tests/manual/qml/testfiles/usingbutton.qml +++ b/tests/manual/qml/testfiles/usingbutton.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/qml/testfiles/webview.qml b/tests/manual/qml/testfiles/webview.qml index e3c42a7c3c..e3e382a173 100644 --- a/tests/manual/qml/testfiles/webview.qml +++ b/tests/manual/qml/testfiles/webview.qml @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/errorhandling/main.cpp b/tests/manual/ssh/errorhandling/main.cpp index b67c1b5951..502b19b655 100644 --- a/tests/manual/ssh/errorhandling/main.cpp +++ b/tests/manual/ssh/errorhandling/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/remoteprocess/argumentscollector.cpp b/tests/manual/ssh/remoteprocess/argumentscollector.cpp index 3399775439..9d4e16a2ab 100644 --- a/tests/manual/ssh/remoteprocess/argumentscollector.cpp +++ b/tests/manual/ssh/remoteprocess/argumentscollector.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ #include "argumentscollector.h" diff --git a/tests/manual/ssh/remoteprocess/argumentscollector.h b/tests/manual/ssh/remoteprocess/argumentscollector.h index 6efdb0d1a7..0ebc7b48a0 100644 --- a/tests/manual/ssh/remoteprocess/argumentscollector.h +++ b/tests/manual/ssh/remoteprocess/argumentscollector.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/remoteprocess/main.cpp b/tests/manual/ssh/remoteprocess/main.cpp index 747ee32f2b..93f8bd7c1a 100644 --- a/tests/manual/ssh/remoteprocess/main.cpp +++ b/tests/manual/ssh/remoteprocess/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/remoteprocess/remoteprocesstest.cpp b/tests/manual/ssh/remoteprocess/remoteprocesstest.cpp index 854caadea2..b17b45207b 100644 --- a/tests/manual/ssh/remoteprocess/remoteprocesstest.cpp +++ b/tests/manual/ssh/remoteprocess/remoteprocesstest.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/remoteprocess/remoteprocesstest.h b/tests/manual/ssh/remoteprocess/remoteprocesstest.h index d990379df0..4df0f0ce18 100644 --- a/tests/manual/ssh/remoteprocess/remoteprocesstest.h +++ b/tests/manual/ssh/remoteprocess/remoteprocesstest.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/sftp/argumentscollector.cpp b/tests/manual/ssh/sftp/argumentscollector.cpp index 2bb5972596..61de496d9f 100644 --- a/tests/manual/ssh/sftp/argumentscollector.cpp +++ b/tests/manual/ssh/sftp/argumentscollector.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/sftp/argumentscollector.h b/tests/manual/ssh/sftp/argumentscollector.h index 460fe2df52..ef90c4229b 100644 --- a/tests/manual/ssh/sftp/argumentscollector.h +++ b/tests/manual/ssh/sftp/argumentscollector.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/sftp/main.cpp b/tests/manual/ssh/sftp/main.cpp index 51d5d8a70b..65b051de4c 100644 --- a/tests/manual/ssh/sftp/main.cpp +++ b/tests/manual/ssh/sftp/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/sftp/parameters.h b/tests/manual/ssh/sftp/parameters.h index 70372f7ad4..6359b031bd 100644 --- a/tests/manual/ssh/sftp/parameters.h +++ b/tests/manual/ssh/sftp/parameters.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/sftp/sftptest.cpp b/tests/manual/ssh/sftp/sftptest.cpp index aab3cb2e67..cbc4cb57b6 100644 --- a/tests/manual/ssh/sftp/sftptest.cpp +++ b/tests/manual/ssh/sftp/sftptest.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/sftp/sftptest.h b/tests/manual/ssh/sftp/sftptest.h index c1a093adc2..0b67ec1de3 100644 --- a/tests/manual/ssh/sftp/sftptest.h +++ b/tests/manual/ssh/sftp/sftptest.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/manual/ssh/shell/main.cpp b/tests/manual/ssh/shell/main.cpp index 5c1bdfcb54..044ba94c35 100644 --- a/tests/manual/ssh/shell/main.cpp +++ b/tests/manual/ssh/shell/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ #include "../remoteprocess/argumentscollector.h" diff --git a/tests/manual/ssh/shell/shell.cpp b/tests/manual/ssh/shell/shell.cpp index 344d7d53fa..08f932209a 100644 --- a/tests/manual/ssh/shell/shell.cpp +++ b/tests/manual/ssh/shell/shell.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ #include "shell.h" diff --git a/tests/manual/ssh/shell/shell.h b/tests/manual/ssh/shell/shell.h index 633b3197cb..befd7a6642 100644 --- a/tests/manual/ssh/shell/shell.h +++ b/tests/manual/ssh/shell/shell.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ #include <QtCore/QObject> diff --git a/tests/system/objects.map b/tests/system/objects.map index c2f01bf078..245d149064 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -5,8 +5,7 @@ :*Qt Creator_Core::Internal::FancyToolButton {occurrence='3' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :*Qt Creator_Utils::FilterLineEdit {type='Utils::FilterLineEdit' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :*Qt Creator_Utils::IconButton {occurrence='4' type='Utils::IconButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} -:Build:_QComboBox {aboveWidget=':Desktop_QLabel' container=':QtCreator.MenuBar_ProjectExplorer::Internal::ProjectListWidget' leftWidget=':Build:_QLabel' type='QComboBox'} -:Build:_QLabel {container=':QtCreator.MenuBar_ProjectExplorer::Internal::ProjectListWidget' name='buildLabel' text='Build:' type='QLabel' visible='1'} +:Build:_QComboBox {aboveWidget=':Desktop_QLabel' container=':QtCreator.MenuBar_ProjectExplorer::Internal::ProjectListWidget' toolTip='Select active build configuration' type='QComboBox'} :CMake Wizard.Finish_QPushButton {text~='(Finish|Done)' type='QPushButton' unnamed='1' visible='1' window=':CMake Wizard_CMakeProjectManager::Internal::CMakeOpenProjectWizard'} :CMake Wizard.Generator:_QLabel {text='Generator:' type='QLabel' unnamed='1' visible='1' window=':CMake Wizard_CMakeProjectManager::Internal::CMakeOpenProjectWizard'} :CMake Wizard.Next_QPushButton {name='__qt__passive_wizardbutton1' text~='(Next.*|Continue)' type='QPushButton' visible='1' window=':CMake Wizard_CMakeProjectManager::Internal::CMakeOpenProjectWizard'} diff --git a/tests/system/settings/windows/Nokia/qtversion.xml b/tests/system/settings/windows/Nokia/qtversion.xml index 8d331de85e..f4b46e5056 100644 --- a/tests/system/settings/windows/Nokia/qtversion.xml +++ b/tests/system/settings/windows/Nokia/qtversion.xml @@ -5,16 +5,6 @@ <data> <variable>QtVersion.0</variable> <valuemap type="QVariantMap"> - <value type="int" key="Id">5</value> - <value type="QString" key="Name">Qt 4.7.4 (qt)</value> - <value type="QString" key="QMakePath">c:/depot/builddir/qt/bin/qmake.exe</value> - <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value> - <value type="bool" key="isAutodetected">false</value> - </valuemap> - </data> - <data> - <variable>QtVersion.1</variable> - <valuemap type="QVariantMap"> <value type="int" key="Id">7</value> <value type="QString" key="Name">Qt 4.7.4 for Desktop - MSVC2008 (Qt SDK)</value> <value type="QString" key="QMakePath">c:/qtsdk/desktop/qt/4.7.4/msvc2008/bin/qmake.exe</value> @@ -24,7 +14,7 @@ </valuemap> </data> <data> - <variable>QtVersion.10</variable> + <variable>QtVersion.1</variable> <valuemap type="QVariantMap"> <value type="int" key="Id">16</value> <value type="QString" key="Name">Qt for Fremantle PR1.3 Devices (Qt SDK)</value> @@ -35,16 +25,6 @@ </valuemap> </data> <data> - <variable>QtVersion.11</variable> - <valuemap type="QVariantMap"> - <value type="int" key="Id">17</value> - <value type="QString" key="Name">Qt 4.8.0 (qt64)</value> - <value type="QString" key="QMakePath">c:/depot/builddir/qt64/bin/qmake.exe</value> - <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value> - <value type="bool" key="isAutodetected">false</value> - </valuemap> - </data> - <data> <variable>QtVersion.2</variable> <valuemap type="QVariantMap"> <value type="int" key="Id">8</value> @@ -140,7 +120,7 @@ </data> <data> <variable>QtVersion.Count</variable> - <value type="int">12</value> + <value type="int">10</value> </data> <data> <variable>Version</variable> diff --git a/tests/system/shared/build_utils.py b/tests/system/shared/build_utils.py index 58728bcb0b..31421ca66f 100644 --- a/tests/system/shared/build_utils.py +++ b/tests/system/shared/build_utils.py @@ -70,10 +70,8 @@ def checkLastBuild(expectedToFail=False): else: test.fail("Errors: %s | Warnings: %s" % (errors, warnings)) # additional stuff - could be removed... or improved :) - toggleIssues = waitForObject("{type='Core::Internal::OutputPaneToggleButton' unnamed='1' " - "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}", 20000) - if not toggleIssues.checked: - clickButton(toggleIssues) + ensureChecked("{type='Core::Internal::OutputPaneToggleButton' unnamed='1' " + "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}") list=waitForObject("{type='QListView' unnamed='1' visible='1' " "window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Issues'}", 20000) model = list.model() @@ -84,10 +82,8 @@ def checkLastBuild(expectedToFail=False): # helper function to check the compilation when build wasn't successful def checkCompile(): - toggleCompOutput = waitForObject("{type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' " - "window=':Qt Creator_Core::Internal::MainWindow' occurrence='4'}", 20000) - if not toggleCompOutput.checked: - clickButton(toggleCompOutput) + ensureChecked("{type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' " + "window=':Qt Creator_Core::Internal::MainWindow' occurrence='4'}") output = waitForObject("{type='Core::OutputWindow' unnamed='1' visible='1' windowTitle='Compile Output'" " window=':Qt Creator_Core::Internal::MainWindow'}", 20000) waitFor("len(str(output.plainText))>0",5000) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index cf2850efac..dc620b245f 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -61,7 +61,7 @@ def __createProjectSelectType__(category, template): clickItem(templatesView, template, 5, 5, 0, Qt.LeftButton) clickButton(waitForObject("{text='Choose...' type='QPushButton' unnamed='1' visible='1'}", 20000)) -def createProjectSetNameAndPath(path, projectName = None, checks = True): +def __createProjectSetNameAndPath__(path, projectName = None, checks = True): directoryEdit = waitForObject("{type='Utils::BaseValidatingLineEdit' unnamed='1' visible='1'}", 20000) replaceEditorContent(directoryEdit, path) projectNameEdit = waitForObject("{name='nameLineEdit' visible='1' " @@ -75,13 +75,11 @@ def createProjectSetNameAndPath(path, projectName = None, checks = True): labelCheck = stateLabel.text=="" and stateLabel.styleSheet == "" test.verify(labelCheck, "Project name and base directory without warning or error") # make sure this is not set as default location - cbDefaultLocation = waitForObject("{type='QCheckBox' name='projectsDirectoryCheckBox' visible='1'}", 20000) - if cbDefaultLocation.checked: - clickButton(cbDefaultLocation) + ensureChecked("{type='QCheckBox' name='projectsDirectoryCheckBox' visible='1'}", False) clickButton(waitForObject(":Next_QPushButton")) return projectName -def createProjectHandleLastPage(expectedFiles = None): +def __createProjectHandleLastPage__(expectedFiles = None): if expectedFiles != None: summary = str(waitForObject(":scrollArea.Files to be added").text) lastIndex = 0 @@ -94,13 +92,8 @@ def createProjectHandleLastPage(expectedFiles = None): def createProject_Qt_GUI(path, projectName, qtVersion, checks): __createProjectSelectType__("Qt Widget Project", "Qt Gui Application") - createProjectSetNameAndPath(path, projectName, checks) - - desktopCheckbox = waitForObject(":scrollArea.Desktop_QCheckBox", 20000) - if checks: - test.compare(desktopCheckbox.text, "Desktop") - if not desktopCheckbox.checked: - clickButton(desktopCheckbox) + __createProjectSetNameAndPath__(path, projectName, checks) + __chooseTargets__() selectFromCombo(":scrollArea.Create Build Configurations:_QComboBox_2", "For One Qt Version One Debug And One Release") selectFromCombo(":scrollArea.Qt Version:_QComboBox", qtVersion.replace(".", "\\.")) if checks: @@ -131,7 +124,7 @@ def createProject_Qt_GUI(path, projectName, qtVersion, checks): expectedFiles = None if checks: expectedFiles = [os.path.join(path, projectName), cpp_file, h_file, ui_file, pro_file] - createProjectHandleLastPage(expectedFiles) + __createProjectHandleLastPage__(expectedFiles) if checks: waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 20000) @@ -149,34 +142,34 @@ def createProject_Qt_GUI(path, projectName, qtVersion, checks): def createNewQtQuickApplication(workingDir, projectName = None, templateFile = None, targets = QtQuickConstants.Targets.DESKTOP): __createProjectSelectType__("Qt Quick Project", "Qt Quick Application") - projectName = createProjectSetNameAndPath(workingDir, projectName) + projectName = __createProjectSetNameAndPath__(workingDir, projectName) if (templateFile==None): - chooseComponents() + __chooseComponents__() else: - chooseComponents(QtQuickConstants.Components.EXISTING_QML) + __chooseComponents__(QtQuickConstants.Components.EXISTING_QML) # define the existing qml file to import baseLineEd = waitForObject("{type='Utils::BaseValidatingLineEdit' unnamed='1' visible='1'}", 20000) type(baseLineEd, templateFile) nextButton = waitForObject(":Next_QPushButton", 20000) clickButton(nextButton) - chooseTargets(targets) + __chooseTargets__(targets) snooze(1) clickButton(nextButton) - createProjectHandleLastPage() + __createProjectHandleLastPage__() def createNewQtQuickUI(workingDir): __createProjectSelectType__("Qt Quick Project", "Qt Quick UI") if workingDir == None: workingDir = tempDir() - createProjectSetNameAndPath(workingDir) - createProjectHandleLastPage() + __createProjectSetNameAndPath__(workingDir) + __createProjectHandleLastPage__() def createNewQmlExtension(workingDir): __createProjectSelectType__("Qt Quick Project", "Custom QML Extension Plugin") if workingDir == None: workingDir = tempDir() - createProjectSetNameAndPath(workingDir) - chooseTargets() + __createProjectSetNameAndPath__(workingDir) + __chooseTargets__() nextButton = waitForObject(":Next_QPushButton") clickButton(nextButton) nameLineEd = waitForObject("{buddy={type='QLabel' text='Object Class-name:' unnamed='1' visible='1'} " @@ -186,4 +179,4 @@ def createNewQmlExtension(workingDir): "type='QLineEdit' unnamed='1' visible='1'}", 20000) replaceEditorContent(uriLineEd, "com.nokia.test.qmlcomponents") clickButton(nextButton) - createProjectHandleLastPage() + __createProjectHandleLastPage__() diff --git a/tests/system/shared/qtquick.py b/tests/system/shared/qtquick.py index 899bdeeda0..a8d6dd3c85 100644 --- a/tests/system/shared/qtquick.py +++ b/tests/system/shared/qtquick.py @@ -53,7 +53,7 @@ def __handleProcessExited__(object, exitCode): processExited = True # parameter components can only be one of the Constants defined in QtQuickConstants.Components -def chooseComponents(components=QtQuickConstants.Components.BUILTIN): +def __chooseComponents__(components=QtQuickConstants.Components.BUILTIN): rbComponentToChoose = waitForObject("{type='QRadioButton' text='%s' visible='1'}" % QtQuickConstants.getStringForComponents(components), 20000) if rbComponentToChoose.checked: @@ -64,22 +64,21 @@ def chooseComponents(components=QtQuickConstants.Components.BUILTIN): % QtQuickConstants.getStringForComponents(components)) # parameter target can be an OR'd value of QtQuickConstants.Targets -def chooseTargets(targets=QtQuickConstants.Targets.DESKTOP): +def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP): # DESKTOP should be always accessible - destDesktop = waitForObject("{type='QCheckBox' text='%s' visible='1'}" - % QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.DESKTOP), 20000) - mustCheck = targets & QtQuickConstants.Targets.DESKTOP==QtQuickConstants.Targets.DESKTOP - if (mustCheck ^ destDesktop.checked): - clickButton(destDesktop) + ensureChecked("{type='QCheckBox' text='%s' visible='1'}" + % QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.DESKTOP), + targets & QtQuickConstants.Targets.DESKTOP) # following targets depend on the build environment - added for further/later tests - available = [QtQuickConstants.Targets.SYMBIAN, QtQuickConstants.Targets.MAEMO5, + available = [QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN] + if platform.system() in ('Windows', 'Microsoft'): + available += [QtQuickConstants.Targets.SYMBIAN] for current in available: mustCheck = targets & current == current try: - targetCheckbox = findObject("{type='QCheckBox' text='%s' visible='1'}" % QtQuickConstants.getStringForTarget(current)) - if mustCheck ^ targetCheckbox.checked: - clickButton(targetCheckbox) + ensureChecked("{type='QCheckBox' text='%s' visible='1'}" % QtQuickConstants.getStringForTarget(current), + mustCheck) except LookupError: if mustCheck: test.fail("Failed to check target '%s'" % QtQuickConstants.getStringForTarget(current)) @@ -103,9 +102,12 @@ def runAndCloseApp(): invokeMenuItem("File", "Exit") return False # the following is currently a work-around for not using hooking into subprocesses - if (waitForObject(":Qt Creator_Core::Internal::OutputPaneToggleButton").checked!=True): - clickButton(":Qt Creator_Core::Internal::OutputPaneToggleButton") - clickButton(":Qt Creator.Stop_QToolButton") + ensureChecked(":Qt Creator_Core::Internal::OutputPaneToggleButton") + playButton = verifyEnabled(":Qt Creator.ReRun_QToolButton", False) + stopButton = verifyEnabled(":Qt Creator.Stop_QToolButton") + clickButton(stopButton) + test.verify(playButton.enabled) + test.compare(stopButton.enabled, False) return True def runAndCloseQtQuickUI(): @@ -117,8 +119,7 @@ def runAndCloseQtQuickUI(): clickButton(runButton) waitFor("processStarted==True", 10000) # the following is currently a work-around for not using hooking into subprocesses - if (waitForObject(":Qt Creator_Core::Internal::OutputPaneToggleButton").checked!=True): - clickButton(":Qt Creator_Core::Internal::OutputPaneToggleButton") + ensureChecked(":Qt Creator_Core::Internal::OutputPaneToggleButton") stop = findObject(":Qt Creator.Stop_QToolButton") waitFor("stop.enabled==True") clickButton(stop) diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index 218df28131..d42db116b6 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -20,6 +20,12 @@ def verifyChecked(objectName): test.compare(object.checked, True) return object +def ensureChecked(objectName, shouldBeChecked = True): + object = waitForObject(objectName, 20000) + if object.checked ^ shouldBeChecked: + clickButton(object) + return object + def verifyEnabled(objectName, expectedState = True): waitFor("object.exists('" + objectName + "')", 20000) object = findObject(objectName) @@ -141,9 +147,7 @@ def invokeMenuItem(menu, item): def logApplicationOutput(): # make sure application output is shown - toggleAppOutput = waitForObject("{type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' " - "window=':Qt Creator_Core::Internal::MainWindow' occurrence='3'}", 20000) - if not toggleAppOutput.checked: - clickButton(toggleAppOutput) + ensureChecked("{type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' " + "window=':Qt Creator_Core::Internal::MainWindow' occurrence='3'}") output = waitForObject("{type='Core::OutputWindow' visible='1' windowTitle='Application Output Window'}", 20000) test.log("Application Output:\n%s" % output.plainText) diff --git a/tests/system/suite_debugger/tst_build_new_project/test.py b/tests/system/suite_debugger/tst_build_new_project/test.py index 2da3f55574..5673f1669b 100644 --- a/tests/system/suite_debugger/tst_build_new_project/test.py +++ b/tests/system/suite_debugger/tst_build_new_project/test.py @@ -6,13 +6,7 @@ project = "SquishProject" def main(): startApplication("qtcreator" + SettingsPath) createProject_Qt_GUI(projectsPath, project, defaultQtVersion, True) - clickButton(verifyEnabled(":*Qt Creator.Run_Core::Internal::FancyToolButton")) - waitForSignal("{type='ProjectExplorer::BuildManager' unnamed='1'}", "buildQueueFinished(bool)") - playButton = verifyEnabled(":Qt Creator.ReRun_QToolButton", False) - stopButton = verifyEnabled(":Qt Creator.Stop_QToolButton") - clickButton(stopButton) - test.verify(playButton.enabled) - test.compare(stopButton.enabled, False) + runAndCloseApp() sendEvent("QCloseEvent", waitForObject(":Qt Creator_Core::Internal::MainWindow")) waitForCleanShutdown() diff --git a/tests/tools/codaclient/codaclientapplication.cpp b/tests/tools/codaclient/codaclientapplication.cpp index 6a31fa889f..fd2df20539 100644 --- a/tests/tools/codaclient/codaclientapplication.cpp +++ b/tests/tools/codaclient/codaclientapplication.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/tools/codaclient/codaclientapplication.h b/tests/tools/codaclient/codaclientapplication.h index 88beb596b8..e1d257d638 100644 --- a/tests/tools/codaclient/codaclientapplication.h +++ b/tests/tools/codaclient/codaclientapplication.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/tools/codaclient/main.cpp b/tests/tools/codaclient/main.cpp index 0c6ba42e69..5e49f1b9e9 100644 --- a/tests/tools/codaclient/main.cpp +++ b/tests/tools/codaclient/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/tools/cplusplus-dump/dumpers.inc b/tests/tools/cplusplus-dump/dumpers.inc index 507ef64a5f..598e2811c5 100644 --- a/tests/tools/cplusplus-dump/dumpers.inc +++ b/tests/tools/cplusplus-dump/dumpers.inc @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/tools/cplusplus-dump/main.cpp b/tests/tools/cplusplus-dump/main.cpp index 861b98528e..0256773d7a 100644 --- a/tests/tools/cplusplus-dump/main.cpp +++ b/tests/tools/cplusplus-dump/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/tools/cplusplus-dump/tests/templ01.cpp b/tests/tools/cplusplus-dump/tests/templ01.cpp index 53453b5122..fb2f43fe18 100644 --- a/tests/tools/cplusplus-dump/tests/templ01.cpp +++ b/tests/tools/cplusplus-dump/tests/templ01.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/tools/qml-ast2dot/main.cpp b/tests/tools/qml-ast2dot/main.cpp index f2bf8c86e9..e496926b0a 100644 --- a/tests/tools/qml-ast2dot/main.cpp +++ b/tests/tools/qml-ast2dot/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/tools/qtquickappblaster/main.cpp b/tests/tools/qtquickappblaster/main.cpp index 0b235e1942..4581fdea97 100644 --- a/tests/tools/qtquickappblaster/main.cpp +++ b/tests/tools/qtquickappblaster/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/callgrind/callgrindparsertests.cpp b/tests/valgrind/callgrind/callgrindparsertests.cpp index 7021e57634..8ec44779f2 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 (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/callgrind/callgrindparsertests.h b/tests/valgrind/callgrind/callgrindparsertests.h index 56048b537a..1849e6900b 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 (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/callgrind/modeltest.cpp b/tests/valgrind/callgrind/modeltest.cpp index 65c483f322..b84102ddbf 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 (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/callgrind/modeltest.h b/tests/valgrind/callgrind/modeltest.h index 1f93af1aa3..26e63c1890 100644 --- a/tests/valgrind/callgrind/modeltest.h +++ b/tests/valgrind/callgrind/modeltest.h @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/modeldemo.cpp b/tests/valgrind/memcheck/modeldemo.cpp index fdaac18046..fa966e3b4d 100644 --- a/tests/valgrind/memcheck/modeldemo.cpp +++ b/tests/valgrind/memcheck/modeldemo.cpp @@ -6,7 +6,7 @@ ** ** Author: Frank Osterfeld, KDAB (frank.osterfeld@kdab.com) ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -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 info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/modeldemo.h b/tests/valgrind/memcheck/modeldemo.h index 135535e3ca..01d861e1d7 100644 --- a/tests/valgrind/memcheck/modeldemo.h +++ b/tests/valgrind/memcheck/modeldemo.h @@ -6,7 +6,7 @@ ** ** Author: Frank Osterfeld, KDAB (frank.osterfeld@kdab.com) ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -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 info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/parsertests.cpp b/tests/valgrind/memcheck/parsertests.cpp index 8fb296cd27..4f0a6a86f5 100644 --- a/tests/valgrind/memcheck/parsertests.cpp +++ b/tests/valgrind/memcheck/parsertests.cpp @@ -6,7 +6,7 @@ ** ** Author: Frank Osterfeld, KDAB (frank.osterfeld@kdab.com) ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -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 info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/parsertests.h b/tests/valgrind/memcheck/parsertests.h index b157d0338a..9f5a14a2c7 100644 --- a/tests/valgrind/memcheck/parsertests.h +++ b/tests/valgrind/memcheck/parsertests.h @@ -6,7 +6,7 @@ ** ** Author: Frank Osterfeld, KDAB (frank.osterfeld@kdab.com) ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -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 info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testapps/free1/main.cpp b/tests/valgrind/memcheck/testapps/free1/main.cpp index c5b7787a90..b91d20e5d9 100644 --- a/tests/valgrind/memcheck/testapps/free1/main.cpp +++ b/tests/valgrind/memcheck/testapps/free1/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testapps/free2/main.cpp b/tests/valgrind/memcheck/testapps/free2/main.cpp index f624174ed9..3309eedbf1 100644 --- a/tests/valgrind/memcheck/testapps/free2/main.cpp +++ b/tests/valgrind/memcheck/testapps/free2/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testapps/invalidjump/main.cpp b/tests/valgrind/memcheck/testapps/invalidjump/main.cpp index 08ca68d6e3..542087faa4 100644 --- a/tests/valgrind/memcheck/testapps/invalidjump/main.cpp +++ b/tests/valgrind/memcheck/testapps/invalidjump/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testapps/leak1/main.cpp b/tests/valgrind/memcheck/testapps/leak1/main.cpp index 4441f4c655..db7f1ec109 100644 --- a/tests/valgrind/memcheck/testapps/leak1/main.cpp +++ b/tests/valgrind/memcheck/testapps/leak1/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testapps/leak2/main.cpp b/tests/valgrind/memcheck/testapps/leak2/main.cpp index cb7ecc206b..7fc6fb7514 100644 --- a/tests/valgrind/memcheck/testapps/leak2/main.cpp +++ b/tests/valgrind/memcheck/testapps/leak2/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testapps/leak3/main.cpp b/tests/valgrind/memcheck/testapps/leak3/main.cpp index aeab3e8368..b0e52e55f5 100644 --- a/tests/valgrind/memcheck/testapps/leak3/main.cpp +++ b/tests/valgrind/memcheck/testapps/leak3/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testapps/leak4/main.cpp b/tests/valgrind/memcheck/testapps/leak4/main.cpp index 9dadc2cf63..34e5ddb50b 100644 --- a/tests/valgrind/memcheck/testapps/leak4/main.cpp +++ b/tests/valgrind/memcheck/testapps/leak4/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testapps/overlap/main.cpp b/tests/valgrind/memcheck/testapps/overlap/main.cpp index 46c64d8d5b..ce89e6351f 100644 --- a/tests/valgrind/memcheck/testapps/overlap/main.cpp +++ b/tests/valgrind/memcheck/testapps/overlap/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testapps/syscall/main.cpp b/tests/valgrind/memcheck/testapps/syscall/main.cpp index 70978c2e99..319c8ae331 100644 --- a/tests/valgrind/memcheck/testapps/syscall/main.cpp +++ b/tests/valgrind/memcheck/testapps/syscall/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testapps/uninit1/main.cpp b/tests/valgrind/memcheck/testapps/uninit1/main.cpp index c35672b482..d6d21c8389 100644 --- a/tests/valgrind/memcheck/testapps/uninit1/main.cpp +++ b/tests/valgrind/memcheck/testapps/uninit1/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testapps/uninit2/main.cpp b/tests/valgrind/memcheck/testapps/uninit2/main.cpp index 7610d7549c..6d6604ea1e 100644 --- a/tests/valgrind/memcheck/testapps/uninit2/main.cpp +++ b/tests/valgrind/memcheck/testapps/uninit2/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testapps/uninit3/main.cpp b/tests/valgrind/memcheck/testapps/uninit3/main.cpp index 31c5d70b36..c50cf63fa2 100644 --- a/tests/valgrind/memcheck/testapps/uninit3/main.cpp +++ b/tests/valgrind/memcheck/testapps/uninit3/main.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testrunner.cpp b/tests/valgrind/memcheck/testrunner.cpp index c063e5227e..305dac291f 100644 --- a/tests/valgrind/memcheck/testrunner.cpp +++ b/tests/valgrind/memcheck/testrunner.cpp @@ -6,7 +6,7 @@ ** ** Author: Milian Wolff, KDAB (milian.wolff@kdab.com) ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -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 info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/tests/valgrind/memcheck/testrunner.h b/tests/valgrind/memcheck/testrunner.h index 36218c5684..c64e3a9954 100644 --- a/tests/valgrind/memcheck/testrunner.h +++ b/tests/valgrind/memcheck/testrunner.h @@ -6,7 +6,7 @@ ** ** Author: Milian Wolff, KDAB (milian.wolff@kdab.com) ** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** ** GNU Lesser General Public License Usage @@ -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 info@qt.nokia.com. +** Nokia at qt-info@nokia.com. ** **************************************************************************/ |