Changeset 846 for trunk/include/QtScript

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• include/QtScript/headers.pri (modified) (1 diff)
• include/QtScript/private/qscriptdate_p.h (deleted)
• include/QtScript/private/qscriptstaticscopeobject_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtScript/private/qscriptstaticscopeobject_p.h )

trunk/include/QtScript/headers.pri

@@ -1 +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 
 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 
-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 
+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/qscript_p.h