Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
authorKent Hansen <khansen@trolltech.com>
Wed, 12 Aug 2009 09:21:36 +0000 (11:21 +0200)
committerKent Hansen <khansen@trolltech.com>
Wed, 12 Aug 2009 09:21:36 +0000 (11:21 +0200)
commit61f454dd144590025d9001b669b102528782bfeb
tree99f34395836f298ac70738ce652dec4e6d30d445
parentd5315a79b86df6350ed9ed2c90074e8fdae8ab4d
parentb3b2bc3f190d80e30b968648dd91048df67b8a50
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend

Conflicts:
configure
src/script/qscriptarray_p.h
src/script/qscriptasm.cpp
src/script/qscriptasm_p.h
src/script/qscriptbuffer_p.h
src/script/qscriptclass.cpp
src/script/qscriptclassdata.cpp
src/script/qscriptclassdata_p.h
src/script/qscriptclassinfo_p.h
src/script/qscriptclasspropertyiterator_p.h
src/script/qscriptcompiler.cpp
src/script/qscriptcompiler_p.h
src/script/qscriptcontext_p.cpp
src/script/qscriptcontext_p.h
src/script/qscriptcontextfwd_p.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_p.h
src/script/qscriptenginefwd_p.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/qscriptnameid_p.h
src/script/qscriptnodepool_p.h
src/script/qscriptobject_p.h
src/script/qscriptobjectfwd_p.h
src/script/qscriptprettypretty.cpp
src/script/qscriptprettypretty_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/qscriptvalueiteratorimpl.cpp
src/script/qscriptvalueiteratorimpl_p.h
65 files changed:
configure
doc/src/qtscript.qdoc
examples/script/calculator/main.cpp
examples/script/qstetrix/main.cpp
qmake/project.cpp
qmake/project.h
src/3rdparty/webkit/JavaScriptCore/runtime/UString.h
src/corelib/tools/qregexp.cpp
src/script/api/qscriptable.cpp
src/script/api/qscriptable.h
src/script/api/qscriptable_p.h
src/script/api/qscriptclass.h
src/script/api/qscriptclasspropertyiterator.cpp
src/script/api/qscriptclasspropertyiterator.h
src/script/api/qscriptcontext.cpp
src/script/api/qscriptcontext.h
src/script/api/qscriptcontext_p.h
src/script/api/qscriptcontextinfo.cpp
src/script/api/qscriptcontextinfo.h
src/script/api/qscriptengine.h
src/script/api/qscriptengineagent.cpp
src/script/api/qscriptengineagent.h
src/script/api/qscriptextensioninterface.h
src/script/api/qscriptextensionplugin.cpp
src/script/api/qscriptextensionplugin.h
src/script/api/qscriptstring.cpp
src/script/api/qscriptstring.h
src/script/api/qscriptstring_p.h
src/script/api/qscriptvalue.h
src/script/api/qscriptvalueiterator.cpp
src/script/api/qscriptvalueiterator.h
src/script/bridge/qscriptactivationobject_p.h
src/script/bridge/qscriptclassobject_p.h
src/script/bridge/qscriptfunction_p.h
src/script/bridge/qscriptvariant_p.h
src/script/parser/qscript.g
src/script/parser/qscriptast.cpp
src/script/parser/qscriptast_p.h
src/script/parser/qscriptastfwd_p.h
src/script/parser/qscriptastvisitor.cpp
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/parser/qscriptsyntaxchecker_p.h
src/script/utils/qscriptdate_p.h
src/script/visitors/qscriptxmlgenerator.cpp
src/script/visitors/qscriptxmlgenerator_p.h
src/scripttools/debugging/qscriptdebugger.cpp
tests/auto/qscriptable/tst_qscriptable.cpp
tests/auto/qscriptclass/tst_qscriptclass.cpp
tests/auto/qscriptcontext/tst_qscriptcontext.cpp
tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
tests/auto/qscriptengine/tst_qscriptengine.cpp
tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
tests/auto/qscriptvalue/tst_qscriptvalue.cpp
tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
tools/configure/configureapp.cpp