← Back to branch summary

~neon/qt/qtscript

~neon/qt/qtscript

Viewing all changes in revision 193.

Committer: The Qt Project
Author(s): Frederik Gladhorn
Date: 2013-02-07 13:05:16 UTC
mfrom: (191.1.1)
Revision ID: git-v1:689406ac2424095d6cd4e6bcb3430e53a7e7bbfa

Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

files added:
src/scripttools/doc

src/scripttools/doc/qtscripttools.qdocconf

src/scripttools/doc/snippets

src/scripttools/doc/snippets/doc_src_qtscripttools.cpp

src/scripttools/doc/snippets/doc_src_qtscripttools.pro

src/scripttools/doc/snippets/scriptdebugger.cpp

src/scripttools/doc/snippets/src.scripttools.qscriptenginedebugger.cpp

src/scripttools/doc/src

src/scripttools/doc/src/qtscripttools-index.qdoc

src/scripttools/doc/src/qtscripttools-module.qdoc

files removed:
doc/src/snippets

doc/src/snippets/code

doc/src/snippets/code/src.scripttools.qscriptenginedebugger.cpp

doc/src/snippets/scriptdebugger.cpp

files modified:
dist/changes-5.0.1

doc/src/examples/defaultprototypes.qdoc

examples/script/README

examples/script/calculator/calculator.desktop

examples/script/context2d/environment.cpp

src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp

src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp

src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h

src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp

src/script/api/qscriptclass.cpp

src/script/api/qscriptcontext.cpp

src/script/api/qscriptcontextinfo.cpp

src/script/api/qscriptengine.cpp

src/script/api/qscriptextensionplugin.cpp

src/script/api/qscriptstring.cpp

src/script/api/qscriptvalue.cpp

src/script/bridge/qscriptqobject.cpp

src/script/doc/qtscript.qdocconf

src/script/doc/snippets/code/doc_src_qtscript.cpp

src/script/doc/src/ecmascript.qdoc

src/script/doc/src/qtscript-index.qdoc

src/script/doc/src/qtscript-module.qdoc

src/script/doc/src/qtscriptdebugger-manual.qdoc

src/script/doc/src/qtscriptextensions.qdoc

src/scripttools/debugging/qscriptenginedebugger.cpp

src/scripttools/scripttools.pro

tests/auto/qscriptcontext/tst_qscriptcontext.cpp

tests/auto/qscriptengine/tst_qscriptengine.cpp

tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp

Show diffs side-by-side

added added

removed removed

dist/changes-5.0.1

doc/src/examples/defaultprototypes.qdoc

doc/src/snippets/

doc/src/snippets/code/

doc/src/snippets/code/src.scripttools.qscriptenginedebugger.cpp

doc/src/snippets/scriptdebugger.cpp

examples/script/README

examples/script/calculator/calculator.desktop

examples/script/context2d/environment.cpp

src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp

src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp

src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h

src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp

src/script/api/qscriptclass.cpp

src/script/api/qscriptcontext.cpp

src/script/api/qscriptcontextinfo.cpp

src/script/api/qscriptengine.cpp

src/script/api/qscriptextensionplugin.cpp

src/script/api/qscriptstring.cpp

src/script/api/qscriptvalue.cpp

src/script/bridge/qscriptqobject.cpp

src/script/doc/qtscript.qdocconf

src/script/doc/snippets/code/doc_src_qtscript.cpp

src/script/doc/src/ecmascript.qdoc

src/script/doc/src/qtscript-index.qdoc

src/script/doc/src/qtscript-module.qdoc

src/script/doc/src/qtscriptdebugger-manual.qdoc

src/script/doc/src/qtscriptextensions.qdoc

src/scripttools/debugging/qscriptenginedebugger.cpp

src/scripttools/doc/

src/scripttools/doc/qtscripttools.qdocconf

src/scripttools/doc/snippets/

src/scripttools/doc/snippets/doc_src_qtscripttools.cpp

src/scripttools/doc/snippets/doc_src_qtscripttools.pro

src/scripttools/doc/snippets/scriptdebugger.cpp

src/scripttools/doc/snippets/src.scripttools.qscriptenginedebugger.cpp

src/scripttools/doc/src/

src/scripttools/doc/src/qtscripttools-index.qdoc

src/scripttools/doc/src/qtscripttools-module.qdoc

src/scripttools/scripttools.pro

tests/auto/qscriptcontext/tst_qscriptcontext.cpp

tests/auto/qscriptengine/tst_qscriptengine.cpp

tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp

Older »