Changeset 561 for trunk/include/QtScript
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 44 deleted
- 30 edited
- 11 copied
-
. (modified) (1 prop)
-
include/QtScript/QScriptProgram (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtScript/QScriptProgram )
-
include/QtScript/QtScript (modified) (1 diff)
-
include/QtScript/headers.pri (modified) (1 diff)
-
include/QtScript/private/qscriptable_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptactivationobject_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtScript/private/qscriptactivationobject_p.h )
-
include/QtScript/private/qscriptarray_p.h (deleted)
-
include/QtScript/private/qscriptasm_p.h (deleted)
-
include/QtScript/private/qscriptast_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptastfwd_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptastvisitor_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptbuffer_p.h (deleted)
-
include/QtScript/private/qscriptclass_p.h (deleted)
-
include/QtScript/private/qscriptclassdata_p.h (deleted)
-
include/QtScript/private/qscriptclassinfo_p.h (deleted)
-
include/QtScript/private/qscriptclassobject_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtScript/private/qscriptclassobject_p.h )
-
include/QtScript/private/qscriptclasspropertyiterator_p.h (deleted)
-
include/QtScript/private/qscriptcompiler_p.h (deleted)
-
include/QtScript/private/qscriptcontext_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptcontextfwd_p.h (deleted)
-
include/QtScript/private/qscriptcontextinfo_p.h (deleted)
-
include/QtScript/private/qscriptdate_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtScript/private/qscriptdate_p.h )
-
include/QtScript/private/qscriptdeclarativeclass_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtScript/private/qscriptdeclarativeclass_p.h )
-
include/QtScript/private/qscriptdeclarativeobject_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtScript/private/qscriptdeclarativeobject_p.h )
-
include/QtScript/private/qscriptecmaarray_p.h (deleted)
-
include/QtScript/private/qscriptecmaboolean_p.h (deleted)
-
include/QtScript/private/qscriptecmacore_p.h (deleted)
-
include/QtScript/private/qscriptecmadate_p.h (deleted)
-
include/QtScript/private/qscriptecmaerror_p.h (deleted)
-
include/QtScript/private/qscriptecmafunction_p.h (deleted)
-
include/QtScript/private/qscriptecmaglobal_p.h (deleted)
-
include/QtScript/private/qscriptecmamath_p.h (deleted)
-
include/QtScript/private/qscriptecmanumber_p.h (deleted)
-
include/QtScript/private/qscriptecmaobject_p.h (deleted)
-
include/QtScript/private/qscriptecmaregexp_p.h (deleted)
-
include/QtScript/private/qscriptecmastring_p.h (deleted)
-
include/QtScript/private/qscriptengine_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptengineagent_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptenginefwd_p.h (deleted)
-
include/QtScript/private/qscriptextenumeration_p.h (deleted)
-
include/QtScript/private/qscriptextqobject_p.h (deleted)
-
include/QtScript/private/qscriptextvariant_p.h (deleted)
-
include/QtScript/private/qscriptfunction_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptgc_p.h (deleted)
-
include/QtScript/private/qscriptglobalobject_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtScript/private/qscriptglobalobject_p.h )
-
include/QtScript/private/qscriptglobals_p.h (deleted)
-
include/QtScript/private/qscriptgrammar_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptlexer_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptmember_p.h (deleted)
-
include/QtScript/private/qscriptmemberfwd_p.h (deleted)
-
include/QtScript/private/qscriptmemorypool_p.h (deleted)
-
include/QtScript/private/qscriptnameid_p.h (deleted)
-
include/QtScript/private/qscriptnodepool_p.h (deleted)
-
include/QtScript/private/qscriptobject_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptobjectdata_p.h (deleted)
-
include/QtScript/private/qscriptobjectfwd_p.h (deleted)
-
include/QtScript/private/qscriptparser_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptprettypretty_p.h (deleted)
-
include/QtScript/private/qscriptprogram_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtScript/private/qscriptprogram_p.h )
-
include/QtScript/private/qscriptqobject_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtScript/private/qscriptqobject_p.h )
-
include/QtScript/private/qscriptrepository_p.h (deleted)
-
include/QtScript/private/qscriptstring_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptsyntaxchecker_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptsyntaxcheckresult_p.h (deleted)
-
include/QtScript/private/qscriptvalue_p.h (modified) (1 diff)
-
include/QtScript/private/qscriptvaluefwd_p.h (deleted)
-
include/QtScript/private/qscriptvalueimpl_p.h (deleted)
-
include/QtScript/private/qscriptvalueimplfwd_p.h (deleted)
-
include/QtScript/private/qscriptvalueiterator_p.h (deleted)
-
include/QtScript/private/qscriptvalueiteratorimpl_p.h (deleted)
-
include/QtScript/private/qscriptvariant_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtScript/private/qscriptvariant_p.h )
-
include/QtScript/private/qscriptxmlgenerator_p.h (deleted)
-
include/QtScript/qscriptable.h (modified) (1 diff)
-
include/QtScript/qscriptclass.h (modified) (1 diff)
-
include/QtScript/qscriptclasspropertyiterator.h (modified) (1 diff)
-
include/QtScript/qscriptcontext.h (modified) (1 diff)
-
include/QtScript/qscriptcontextinfo.h (modified) (1 diff)
-
include/QtScript/qscriptengine.h (modified) (1 diff)
-
include/QtScript/qscriptengineagent.h (modified) (1 diff)
-
include/QtScript/qscriptextensioninterface.h (modified) (1 diff)
-
include/QtScript/qscriptextensionplugin.h (modified) (1 diff)
-
include/QtScript/qscriptprogram.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtScript/qscriptprogram.h )
-
include/QtScript/qscriptstring.h (modified) (1 diff)
-
include/QtScript/qscriptvalue.h (modified) (1 diff)
-
include/QtScript/qscriptvalueiterator.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/include/QtScript/QtScript
r2 r561 11 11 #include "qscriptextensioninterface.h" 12 12 #include "qscriptextensionplugin.h" 13 #include "qscriptprogram.h" 13 14 #include "qscriptstring.h" 14 15 #include "qscriptvalue.h" -
trunk/include/QtScript/headers.pri
r2 r561 1 SYNCQT.HEADER_FILES = qscriptable.h qscriptclass.h qscriptclasspropertyiterator.h qscriptcontext.h qscriptcontextinfo.h qscriptengine.h qscriptengineagent.h qscriptextensioninterface.h qscriptextensionplugin.h qscriptstring.h qscriptvalue.h qscriptvalueiterator.h ../../include/QtScript/QtScript 2 SYNCQT.HEADER_CLASSES = ../../include/QtScript/QScriptable ../../include/QtScript/QScriptClass ../../include/QtScript/QScriptClassPropertyIterator ../../include/QtScript/QScriptContext ../../include/QtScript/QScriptContextInfo ../../include/QtScript/QScriptContextInfoList ../../include/QtScript/QScriptSyntaxCheckResult ../../include/QtScript/QScriptEngine ../../include/QtScript/QScriptEngineAgent ../../include/QtScript/QScriptExtensionInterface ../../include/QtScript/QScriptExtensionPlugin ../../include/QtScript/QScriptString ../../include/QtScript/QScriptValueList ../../include/QtScript/QScriptValue ../../include/QtScript/QScriptValueIterator 1 SYNCQT.HEADER_FILES = ../script/api/qscriptable.h ../script/api/qscriptclass.h ../script/api/qscriptclasspropertyiterator.h ../script/api/qscriptcontext.h ../script/api/qscriptcontextinfo.h ../script/api/qscriptengine.h ../script/api/qscriptengineagent.h ../script/api/qscriptextensioninterface.h ../script/api/qscriptextensionplugin.h ../script/api/qscriptprogram.h ../script/api/qscriptstring.h ../script/api/qscriptvalue.h ../script/api/qscriptvalueiterator.h ../../include/QtScript/QtScript 2 SYNCQT.HEADER_CLASSES = ../../include/QtScript/QScriptable ../../include/QtScript/QScriptClass ../../include/QtScript/QScriptClassPropertyIterator ../../include/QtScript/QScriptContext ../../include/QtScript/QScriptContextInfo ../../include/QtScript/QScriptContextInfoList ../../include/QtScript/QScriptSyntaxCheckResult ../../include/QtScript/QScriptEngine ../../include/QtScript/QScriptEngineAgent ../../include/QtScript/QScriptExtensionInterface ../../include/QtScript/QScriptExtensionPlugin ../../include/QtScript/QScriptProgram ../../include/QtScript/QScriptString ../../include/QtScript/QScriptValueList ../../include/QtScript/QScriptValue ../../include/QtScript/QScriptValueIterator 3 SYNCQT.PRIVATE_HEADER_FILES = ../script/api/qscriptable_p.h ../script/api/qscriptcontext_p.h ../script/api/qscriptengine_p.h ../script/api/qscriptengineagent_p.h ../script/api/qscriptprogram_p.h ../script/api/qscriptstring_p.h ../script/api/qscriptvalue_p.h ../script/bridge/qscriptactivationobject_p.h ../script/bridge/qscriptclassobject_p.h ../script/bridge/qscriptdeclarativeclass_p.h ../script/bridge/qscriptdeclarativeobject_p.h ../script/bridge/qscriptfunction_p.h ../script/bridge/qscriptglobalobject_p.h ../script/bridge/qscriptobject_p.h ../script/bridge/qscriptqobject_p.h ../script/bridge/qscriptvariant_p.h ../script/parser/qscriptast_p.h ../script/parser/qscriptastfwd_p.h ../script/parser/qscriptastvisitor_p.h ../script/parser/qscriptgrammar_p.h ../script/parser/qscriptlexer_p.h ../script/parser/qscriptparser_p.h ../script/parser/qscriptsyntaxchecker_p.h ../script/utils/qscriptdate_p.h -
trunk/include/QtScript/private/qscriptable_p.h
r2 r561 1 #include "../../../src/script/ qscriptable_p.h"1 #include "../../../src/script/api/qscriptable_p.h" -
trunk/include/QtScript/private/qscriptast_p.h
r2 r561 1 #include "../../../src/script/ qscriptast_p.h"1 #include "../../../src/script/parser/qscriptast_p.h" -
trunk/include/QtScript/private/qscriptastfwd_p.h
r2 r561 1 #include "../../../src/script/ qscriptastfwd_p.h"1 #include "../../../src/script/parser/qscriptastfwd_p.h" -
trunk/include/QtScript/private/qscriptastvisitor_p.h
r2 r561 1 #include "../../../src/script/ qscriptastvisitor_p.h"1 #include "../../../src/script/parser/qscriptastvisitor_p.h" -
trunk/include/QtScript/private/qscriptcontext_p.h
r2 r561 1 #include "../../../src/script/ qscriptcontext_p.h"1 #include "../../../src/script/api/qscriptcontext_p.h" -
trunk/include/QtScript/private/qscriptengine_p.h
r2 r561 1 #include "../../../src/script/ qscriptengine_p.h"1 #include "../../../src/script/api/qscriptengine_p.h" -
trunk/include/QtScript/private/qscriptengineagent_p.h
r2 r561 1 #include "../../../src/script/ qscriptengineagent_p.h"1 #include "../../../src/script/api/qscriptengineagent_p.h" -
trunk/include/QtScript/private/qscriptfunction_p.h
r2 r561 1 #include "../../../src/script/ qscriptfunction_p.h"1 #include "../../../src/script/bridge/qscriptfunction_p.h" -
trunk/include/QtScript/private/qscriptgrammar_p.h
r2 r561 1 #include "../../../src/script/ qscriptgrammar_p.h"1 #include "../../../src/script/parser/qscriptgrammar_p.h" -
trunk/include/QtScript/private/qscriptlexer_p.h
r2 r561 1 #include "../../../src/script/ qscriptlexer_p.h"1 #include "../../../src/script/parser/qscriptlexer_p.h" -
trunk/include/QtScript/private/qscriptobject_p.h
r2 r561 1 #include "../../../src/script/ qscriptobject_p.h"1 #include "../../../src/script/bridge/qscriptobject_p.h" -
trunk/include/QtScript/private/qscriptparser_p.h
r2 r561 1 #include "../../../src/script/ qscriptparser_p.h"1 #include "../../../src/script/parser/qscriptparser_p.h" -
trunk/include/QtScript/private/qscriptstring_p.h
r2 r561 1 #include "../../../src/script/ qscriptstring_p.h"1 #include "../../../src/script/api/qscriptstring_p.h" -
trunk/include/QtScript/private/qscriptsyntaxchecker_p.h
r2 r561 1 #include "../../../src/script/ qscriptsyntaxchecker_p.h"1 #include "../../../src/script/parser/qscriptsyntaxchecker_p.h" -
trunk/include/QtScript/private/qscriptvalue_p.h
r2 r561 1 #include "../../../src/script/ qscriptvalue_p.h"1 #include "../../../src/script/api/qscriptvalue_p.h" -
trunk/include/QtScript/qscriptable.h
r2 r561 1 #include "../../src/script/ qscriptable.h"1 #include "../../src/script/api/qscriptable.h" -
trunk/include/QtScript/qscriptclass.h
r2 r561 1 #include "../../src/script/ qscriptclass.h"1 #include "../../src/script/api/qscriptclass.h" -
trunk/include/QtScript/qscriptclasspropertyiterator.h
r2 r561 1 #include "../../src/script/ qscriptclasspropertyiterator.h"1 #include "../../src/script/api/qscriptclasspropertyiterator.h" -
trunk/include/QtScript/qscriptcontext.h
r2 r561 1 #include "../../src/script/ qscriptcontext.h"1 #include "../../src/script/api/qscriptcontext.h" -
trunk/include/QtScript/qscriptcontextinfo.h
r2 r561 1 #include "../../src/script/ qscriptcontextinfo.h"1 #include "../../src/script/api/qscriptcontextinfo.h" -
trunk/include/QtScript/qscriptengine.h
r2 r561 1 #include "../../src/script/ qscriptengine.h"1 #include "../../src/script/api/qscriptengine.h" -
trunk/include/QtScript/qscriptengineagent.h
r2 r561 1 #include "../../src/script/ qscriptengineagent.h"1 #include "../../src/script/api/qscriptengineagent.h" -
trunk/include/QtScript/qscriptextensioninterface.h
r2 r561 1 #include "../../src/script/ qscriptextensioninterface.h"1 #include "../../src/script/api/qscriptextensioninterface.h" -
trunk/include/QtScript/qscriptextensionplugin.h
r2 r561 1 #include "../../src/script/ qscriptextensionplugin.h"1 #include "../../src/script/api/qscriptextensionplugin.h" -
trunk/include/QtScript/qscriptstring.h
r2 r561 1 #include "../../src/script/ qscriptstring.h"1 #include "../../src/script/api/qscriptstring.h" -
trunk/include/QtScript/qscriptvalue.h
r2 r561 1 #include "../../src/script/ qscriptvalue.h"1 #include "../../src/script/api/qscriptvalue.h" -
trunk/include/QtScript/qscriptvalueiterator.h
r2 r561 1 #include "../../src/script/ qscriptvalueiterator.h"1 #include "../../src/script/api/qscriptvalueiterator.h"
Note:
See TracChangeset
for help on using the changeset viewer.
