Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend

Conflicts:
	src/script/api/qscriptable.cpp
	src/script/api/qscriptclasspropertyiterator.cpp
	src/script/api/qscriptcontext.cpp
	src/script/api/qscriptengine.h
	src/script/api/qscriptengineagent.cpp
	src/script/api/qscriptextensionplugin.cpp
	src/script/api/qscriptvalue.h
	src/script/api/qscriptvalueiterator.cpp
	src/script/parser/qscript.g
	src/script/parser/qscriptast.cpp
	src/script/parser/qscriptast_p.h
	src/script/parser/qscriptastvisitor_p.h
	src/script/parser/qscriptgrammar.cpp
	src/script/parser/qscriptgrammar_p.h
	src/script/parser/qscriptlexer.cpp
	src/script/parser/qscriptlexer_p.h
	src/script/parser/qscriptparser.cpp
	src/script/parser/qscriptparser_p.h
	src/script/parser/qscriptsyntaxchecker.cpp
	src/script/qscriptable.h
	src/script/qscriptable_p.h
	src/script/qscriptarray_p.h
	src/script/qscriptasm.cpp
	src/script/qscriptasm_p.h
	src/script/qscriptastfwd_p.h
	src/script/qscriptastvisitor.cpp
	src/script/qscriptbuffer_p.h
	src/script/qscriptclass.cpp
	src/script/qscriptclass.h
	src/script/qscriptclass_p.h
	src/script/qscriptclassdata.cpp
	src/script/qscriptclassdata_p.h
	src/script/qscriptclassinfo_p.h
	src/script/qscriptclasspropertyiterator.h
	src/script/qscriptclasspropertyiterator_p.h
	src/script/qscriptcompiler.cpp
	src/script/qscriptcompiler_p.h
	src/script/qscriptcontext.h
	src/script/qscriptcontext_p.cpp
	src/script/qscriptcontext_p.h
	src/script/qscriptcontextfwd_p.h
	src/script/qscriptcontextinfo.cpp
	src/script/qscriptcontextinfo.h
	src/script/qscriptcontextinfo_p.h
	src/script/qscriptecmaarray.cpp
	src/script/qscriptecmaarray_p.h
	src/script/qscriptecmaboolean.cpp
	src/script/qscriptecmaboolean_p.h
	src/script/qscriptecmacore.cpp
	src/script/qscriptecmacore_p.h
	src/script/qscriptecmadate.cpp
	src/script/qscriptecmadate_p.h
	src/script/qscriptecmaerror.cpp
	src/script/qscriptecmaerror_p.h
	src/script/qscriptecmafunction.cpp
	src/script/qscriptecmafunction_p.h
	src/script/qscriptecmaglobal.cpp
	src/script/qscriptecmaglobal_p.h
	src/script/qscriptecmamath.cpp
	src/script/qscriptecmamath_p.h
	src/script/qscriptecmanumber.cpp
	src/script/qscriptecmanumber_p.h
	src/script/qscriptecmaobject.cpp
	src/script/qscriptecmaobject_p.h
	src/script/qscriptecmaregexp.cpp
	src/script/qscriptecmaregexp_p.h
	src/script/qscriptecmastring.cpp
	src/script/qscriptecmastring_p.h
	src/script/qscriptengine.cpp
	src/script/qscriptengine_p.cpp
	src/script/qscriptengine_p.h
	src/script/qscriptengineagent.h
	src/script/qscriptengineagent_p.h
	src/script/qscriptenginefwd_p.h
	src/script/qscriptextensioninterface.h
	src/script/qscriptextensionplugin.h
	src/script/qscriptextenumeration.cpp
	src/script/qscriptextenumeration_p.h
	src/script/qscriptextqobject.cpp
	src/script/qscriptextqobject_p.h
	src/script/qscriptextvariant.cpp
	src/script/qscriptextvariant_p.h
	src/script/qscriptfunction.cpp
	src/script/qscriptfunction_p.h
	src/script/qscriptgc_p.h
	src/script/qscriptglobals_p.h
	src/script/qscriptmember_p.h
	src/script/qscriptmemberfwd_p.h
	src/script/qscriptmemorypool_p.h
	src/script/qscriptnameid_p.h
	src/script/qscriptnodepool_p.h
	src/script/qscriptobject_p.h
	src/script/qscriptobjectdata_p.h
	src/script/qscriptobjectfwd_p.h
	src/script/qscriptrepository_p.h
	src/script/qscriptstring.cpp
	src/script/qscriptstring.h
	src/script/qscriptstring_p.h
	src/script/qscriptsyntaxchecker_p.h
	src/script/qscriptsyntaxcheckresult_p.h
	src/script/qscriptvalue.cpp
	src/script/qscriptvalue_p.h
	src/script/qscriptvaluefwd_p.h
	src/script/qscriptvalueimpl.cpp
	src/script/qscriptvalueimpl_p.h
	src/script/qscriptvalueimplfwd_p.h
	src/script/qscriptvalueiterator.h
	src/script/qscriptvalueiterator_p.h
	src/script/qscriptvalueiteratorimpl.cpp
	src/script/qscriptvalueiteratorimpl_p.h
	src/script/visitors/qscriptprettypretty.cpp
	src/script/visitors/qscriptprettypretty_p.h
	src/script/visitors/qscriptxmlgenerator.cpp
	src/script/visitors/qscriptxmlgenerator_p.h

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp b/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp
index a2a2dcb..a65c3f3 100644
--- a/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp
+++ b/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/