summaryrefslogtreecommitdiffstats
path: root/src/scripttools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-282-10/+10
|\ | | | | | | | | | | | | Conflicts: src/corelib/tools/qregexp.cpp src/script/qscriptengine.cpp src/script/qscriptvalue.cpp
| * doc: Changed several \reimp to \internalMartin Smith2009-07-201-1/+1
| | | | | | | | The base function was \internal pr private.
| * doc: Changed several \reimp to \internalMartin Smith2009-07-201-9/+9
| | | | | | | | The base function was \internal pr private.
* | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-06-29142-311/+355
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * make sure __FILE__ and __LINE__ properties are restored correctlyKent Hansen2009-06-171-4/+6
| | | | | | | | Task-number: 256184
| * fix crash when detach()ing a debugger and then evaluating script print() ↵Joel Nordell2009-06-172-7/+14
| | | | | | | | | | | | | | function Merge-request: 554 Reviewed-by: Kent Hansen <khansen@trolltech.com>
| * reset debugger's state correctly when previous engine was deletedKent Hansen2009-06-171-15/+15
| | | | | | | | | | | | If the engine was deleted, the agent will be 0, but we still want to fall through rather than return immediately, so that the other variables are reset correctly.
| * kill some includes not needed anymoreKent Hansen2009-06-171-4/+0
| | | | | | | | The debugger is completely abstracted from QScriptEngine, whee
| * fix the QScriptEngineDebugger::state() logic, add test, improve docsKent Hansen2009-06-171-2/+5
| |
| * add a state() function to QScriptEngineDebugger for determining whether the debuJoel Nordell2009-06-174-0/+36
| | | | | | | | | | | | | | gger is suspended or not Merge-request: 555 Reviewed-by: Kent Hansen <khansen@trolltech.com>
| * Update license headers in files that are new in 4.6.Jason McDonald2009-06-171-2/+2
| | | | | | | | Reviewed-by: Trust Me
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-16141-282/+282
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-16140-280/+280
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | attempt to compile on solarisKent Hansen2009-06-161-2/+2
| | |
* | | Import JSC-based Qt Script from Kent's tree.Simon Hausmann2009-06-161-1/+2
|/ /
* | small refactoring so remote debugger can use the same codeKent Hansen2009-06-153-33/+52
| |
* | don't try to delete script object snapshots when debugger front-end is deletedKent Hansen2009-06-151-1/+0
| | | | | | | | | | | | | | | | | | | | The locals model is technically part of the debugger front-end. When it's deleted we will have detached (or are in the process of detaching) from the debugger target anyway, which means that the object snapshots will be cleaned up by the back-end itself. In any case we shouldn't be sending debugger commands from a destructor, since we're not in a stable state. For in-process debugging, we were lucky and this magically worked, but for out-of-process debugging it caused the debugger to crash.
* | small refactoringKent Hansen2009-06-151-7/+10
| | | | | | | | Preparing to make it work with remote debugging.
* | Fixed compile of scripttools with MSVC 2003.Rohan McGovern2009-06-131-0/+1
| | | | | | | | | | | | | | Fixes compile error: debugging\qscriptdebuggercommand.cpp(567) : error C2664: 'QScriptDebuggerCommand::setAttribute' : cannot convert parameter 2 from 'const QStringList' to 'const QVariant &' Reason: cannot convert from 'const QStringList' to 'const QVariant' Source or target has incomplete type
* | refactor some script debugger internalsKent Hansen2009-06-127-148/+363
| | | | | | | | Make it possible to reuse more code in remote debugger.
* | make debugger console's auto-completion asynchronousKent Hansen2009-06-128-103/+196
| | | | | | | | Needed for remote debugging.
* | make debugger's tooltip handling asynchronousKent Hansen2009-06-128-56/+110
| | | | | | | | Needed for remote debugging.
* | fix bugs in the completion+tooltip providersKent Hansen2009-06-122-3/+2
| |
* | add streaming ops for scriptdebugger object deltasKent Hansen2009-06-122-0/+22
| | | | | | | | Needed for remote debugging.
* | improved string operations all over the placeThierry Bastian2009-05-284-9/+9
|/ | | | | used character operations whenever possible better usage of QLatin1String
* Fixed compilation with -qtnamespaceMarkus Goetz2009-05-221-3/+10
| | | | | Task-number: 254333 Reviewed-by: Andy Shaw <qt-info@nokia.com>
* Remove obsolete pre-processor directives that check QT_VERSION.Jason McDonald2009-04-1613-101/+0
| | | | Reviewed-by: Kent Hansen
* Long live Qt 4.5!Lars Knoll2009-03-23197-0/+27892