summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-18 18:02:46 +0100
committerKai Koehne <kai.koehne@qt.io>2018-01-19 10:56:39 +0100
commit84b13fd9fcd85d39411150f8ae46916a048c413c (patch)
treec04b2996a5b22a0da2e8df965a82558735e49a38 /examples
parent86317d8799cba34ad682a1709cf46a5eee815c82 (diff)
parent8399cdfbaf2aceab9c22fdcb10d2369ddb39b5df (diff)
downloadqtscript-5.10.tar.gz
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts: .qmake.conf src/plugins/script/qtdbus/main.cpp src/plugins/script/qtdbus/main.h src/script/api/qtscriptglobal.h src/script/parser/make-parser.sh src/script/parser/qscript.g src/scripttools/debugging/qscriptbreakpointdata.cpp src/scripttools/debugging/qscriptbreakpointdata_p.h src/scripttools/debugging/qscriptbreakpointsmodel.cpp src/scripttools/debugging/qscriptbreakpointsmodel_p.h src/scripttools/debugging/qscriptbreakpointswidget.cpp src/scripttools/debugging/qscriptbreakpointswidget_p.h src/scripttools/debugging/qscriptbreakpointswidgetinterface.cpp src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h src/scripttools/debugging/qscriptcompletionproviderinterface_p.h src/scripttools/debugging/qscriptcompletiontask.cpp src/scripttools/debugging/qscriptcompletiontask_p.h src/scripttools/debugging/qscriptcompletiontaskinterface.cpp src/scripttools/debugging/qscriptcompletiontaskinterface_p.h src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h src/scripttools/debugging/qscriptdebugger.cpp src/scripttools/debugging/qscriptdebugger_p.h src/scripttools/debugging/qscriptdebuggeragent.cpp src/scripttools/debugging/qscriptdebuggeragent_p.h src/scripttools/debugging/qscriptdebuggeragent_p_p.h src/scripttools/debugging/qscriptdebuggerbackend.cpp src/scripttools/debugging/qscriptdebuggerbackend_p.h src/scripttools/debugging/qscriptdebuggerbackend_p_p.h src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h src/scripttools/debugging/qscriptdebuggercodeview.cpp src/scripttools/debugging/qscriptdebuggercodeview_p.h src/scripttools/debugging/qscriptdebuggercodeviewinterface.cpp src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h src/scripttools/debugging/qscriptdebuggercodewidget.cpp src/scripttools/debugging/qscriptdebuggercodewidget_p.h src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h src/scripttools/debugging/qscriptdebuggercommand.cpp src/scripttools/debugging/qscriptdebuggercommand_p.h src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend.cpp src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend_p.h src/scripttools/debugging/qscriptdebuggercommandschedulerinterface_p.h src/scripttools/debugging/qscriptdebuggercommandschedulerjob.cpp src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p_p.h src/scripttools/debugging/qscriptdebuggerconsole.cpp src/scripttools/debugging/qscriptdebuggerconsole_p.h src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h src/scripttools/debugging/qscriptdebuggerconsolecommand_p_p.h src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h src/scripttools/debugging/qscriptdebuggerconsolecommandjob.cpp src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p_p.h src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h src/scripttools/debugging/qscriptdebuggerconsolehistorianinterface_p.h src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface.cpp src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h src/scripttools/debugging/qscriptdebuggerevent.cpp src/scripttools/debugging/qscriptdebuggerevent_p.h src/scripttools/debugging/qscriptdebuggereventhandlerinterface_p.h src/scripttools/debugging/qscriptdebuggerfrontend.cpp src/scripttools/debugging/qscriptdebuggerfrontend_p.h src/scripttools/debugging/qscriptdebuggerfrontend_p_p.h src/scripttools/debugging/qscriptdebuggerjob.cpp src/scripttools/debugging/qscriptdebuggerjob_p.h src/scripttools/debugging/qscriptdebuggerjob_p_p.h src/scripttools/debugging/qscriptdebuggerjobschedulerinterface_p.h src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface.cpp src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h src/scripttools/debugging/qscriptdebuggerobjectsnapshotdelta_p.h src/scripttools/debugging/qscriptdebuggerresponse.cpp src/scripttools/debugging/qscriptdebuggerresponse_p.h src/scripttools/debugging/qscriptdebuggerresponsehandlerinterface_p.h src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h src/scripttools/debugging/qscriptdebuggerscriptsmodel.cpp src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h src/scripttools/debugging/qscriptdebuggerstackmodel.cpp src/scripttools/debugging/qscriptdebuggerstackmodel_p.h src/scripttools/debugging/qscriptdebuggerstackwidget.cpp src/scripttools/debugging/qscriptdebuggerstackwidget_p.h src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory.cpp src/scripttools/debugging/qscriptdebuggerstandardwidgetfactory_p.h src/scripttools/debugging/qscriptdebuggervalue.cpp src/scripttools/debugging/qscriptdebuggervalue_p.h src/scripttools/debugging/qscriptdebuggervalueproperty.cpp src/scripttools/debugging/qscriptdebuggervalueproperty_p.h src/scripttools/debugging/qscriptdebuggerwidgetfactoryinterface_p.h src/scripttools/debugging/qscriptdebugoutputwidget.cpp src/scripttools/debugging/qscriptdebugoutputwidget_p.h src/scripttools/debugging/qscriptdebugoutputwidgetinterface.cpp src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h src/scripttools/debugging/qscriptedit.cpp src/scripttools/debugging/qscriptedit_p.h src/scripttools/debugging/qscriptenginedebugger.cpp src/scripttools/debugging/qscriptenginedebugger.h src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h src/scripttools/debugging/qscripterrorlogwidget.cpp src/scripttools/debugging/qscripterrorlogwidget_p.h src/scripttools/debugging/qscripterrorlogwidgetinterface.cpp src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h src/scripttools/debugging/qscriptmessagehandlerinterface_p.h src/scripttools/debugging/qscriptobjectsnapshot.cpp src/scripttools/debugging/qscriptobjectsnapshot_p.h src/scripttools/debugging/qscriptscriptdata.cpp src/scripttools/debugging/qscriptscriptdata_p.h src/scripttools/debugging/qscriptstdmessagehandler.cpp src/scripttools/debugging/qscriptstdmessagehandler_p.h src/scripttools/debugging/qscriptsyntaxhighlighter.cpp src/scripttools/debugging/qscriptsyntaxhighlighter_p.h src/scripttools/debugging/qscripttooltipproviderinterface_p.h src/scripttools/debugging/qscriptvalueproperty.cpp src/scripttools/debugging/qscriptvalueproperty_p.h src/scripttools/debugging/qscriptxmlparser.cpp src/scripttools/debugging/qscriptxmlparser_p.h tests/auto/compilerwarnings/data/test_cpp.txt 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/qscriptenginedebugger/tst_qscriptenginedebugger.cpp tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.cpp tests/auto/qscriptextensionplugin/staticplugin/staticplugin.cpp tests/auto/qscriptextensionplugin/tst_qscriptextensionplugin.cpp tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp tests/auto/qscriptstring/tst_qscriptstring.cpp tests/auto/qscriptv8testsuite/abstracttestsuite.cpp tests/auto/qscriptv8testsuite/abstracttestsuite.h tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp tests/auto/shared/util.h tests/benchmarks/script/context2d/tst_context2d.cpp tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp tests/benchmarks/script/qscriptqobject/tst_qscriptqobject.cpp tests/benchmarks/script/qscriptvalue/tst_qscriptvalue.cpp tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp tests/benchmarks/script/sunspider/tst_sunspider.cpp tests/benchmarks/script/v8/tst_v8.cpp Change-Id: I4b4c7940d26ea5760d58620f4c53e96fad84af76
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions