summaryrefslogtreecommitdiffstats
path: root/src/script/api
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-171-3/+1
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-141-3/+1
| |\
| | * Don't leak ScopeChainNode'sAaron Kennedy2011-02-141-3/+1
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-104-5/+32
|\ \ \ | |/ /
| * | Don't crash when creating backtrace for built-in JS function (2nd try)Kent Hansen2011-02-084-4/+30
| * | Don't crash when creating backtrace for built-in JS functionKent Hansen2011-02-031-1/+2
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-02-091-9/+9
|\ \
| * | QScriptEngine: fix property flags for native functionsCaio Marcelo de Oliveira Filho2011-02-091-9/+9
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-014-7/+42
|\ \ \ | |/ / |/| / | |/
| * Invalidate QScriptPrograms when engine is destroyedKent Hansen2011-01-284-7/+42
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-01-171-2/+2
|\ \
| * | Fix QScriptValueIterator::hasNext and QScriptValueIterator::hasPreviousJedrzej Nowacki2011-01-171-2/+2
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1732-32/+32
|\ \ \ | |/ / |/| / | |/
| * Update copyright year to 2011.Jason McDonald2011-01-1032-32/+32
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-251-1/+3
|\ \
| * | QtScript variant conversion: Convert numbers to (u)int if applicable (reviewe...Thomas Senyk2010-11-251-1/+3
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-1/+1
|\ \ \ | |/ / |/| / | |/
| * Doc: Fixing typoSergio Ahumada2010-11-161-1/+1
* | Fix QScriptValue::construct.Jedrzej Nowacki2010-11-221-1/+14
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-0/+1
|\ \ | |/
| * Fix GC-related crash in QScriptValue::setData()Kent Hansen2010-11-091-0/+1
* | Make qsTr() work with Unicode (non-Latin-1) stringsKent Hansen2010-11-081-9/+9
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-301-4/+1
|\ \
| * | Don't crash when null-pointer is passed to qScriptValueFromValue()Kent Hansen2010-10-291-4/+1
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-291-5/+8
|\ \ \ | |/ / |/| / | |/
| * QScriptValue::construct(): Don't crash if function throws non-ObjectKent Hansen2010-10-281-5/+8
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-2/+5
|\ \ | |/
| * Fix QScriptEngine::abortEvaluation.Jedrzej Nowacki2010-09-301-2/+5
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-1/+1
|\ \ | |/
| * Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-032-5/+2
| |\
| * | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-1/+1
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-102-5/+2
|\ \ \ | | |/ | |/|
| * | doc: Remove \internal tag from QScriptProgramKent Hansen2010-08-312-5/+2
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-0/+28
|\ \ | |/
| * Make qsTrId() / QT_TRID_NOOP() accessible from QtScriptKent Hansen2010-08-231-0/+28
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-135-24/+23
|\ \ | |/
| * Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-091-1/+1
| * QScript: remove JSC::JSLockOlivier Goffart2010-07-291-4/+0
| * QScript: document/obsolete things that does not work since the move to JSCOlivier Goffart2010-07-295-20/+23
* | Compile.Yoann Lopes2010-08-061-1/+1
* | Fix recursion in QScriptEngine::toScriptValueOlivier Goffart2010-08-061-1/+1
* | Remove usage of deprecated QScriptValue* functionOlivier Goffart2010-08-061-2/+2
* | Deprecate qScriptValueFromQMetaObject, qScriptValueToValue, qScriptValueFromV...Olivier Goffart2010-08-062-23/+31
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-061-1/+1
* | It is no longer necessary to check for QT_NO_MEMBER_TEMPLATESminiak2010-08-031-8/+0
* | Fix MS Visual C++ 6.0 references in the documentationminiak2010-08-031-19/+13
* | Remove obsolete code & workarounds for unsupported versions of MS Visual C++miniak2010-08-033-29/+2
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-284-1/+13
|\ \ | |/
| * QScriptEngineAgent: recompile all the function when installing a debugger.Olivier Goffart2010-07-272-0/+3
| * QScriptValue::objectId(): do not assert if the value is not a cellOlivier Goffart2010-07-271-1/+1