summaryrefslogtreecommitdiffstats
path: root/src/script/api
Commit message (Expand)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-1132-32/+32
* Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-241-9/+9
|\
| * Removed some superfluous semicolonsThorbjørn Lindeijer2011-05-021-9/+9
* | Doc: Fixed qdoc warnings.David Boddie2011-05-111-1/+1
|/
* Fix compilation with QT_NO_Tasuku Suzuki2011-03-211-0/+6
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-141-2/+2
|\
| * Deprecate QScriptValue::UserRangeKent Hansen2011-03-111-1/+1
| * Deprecate QScriptValue::QObjectMemberKent Hansen2011-03-111-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-022-3/+15
|\ \ | |/
| * Don't allow non-Object values to be set as prototypeKent Hansen2011-03-021-2/+6
| * Avoid asserting when computing line number for backtraceKent Hansen2011-03-011-1/+9
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-013-13/+33
|\ \
| * | Make QtScript support COLLECT_ON_EVERY_ALLOCATION defineKent Hansen2011-02-251-11/+12
| * | Add missing API shims to QScriptValue constructorsKent Hansen2011-02-251-0/+5
| * | Don't crash when marking arguments object of native contextKent Hansen2011-02-252-2/+16
* | | add missing includeRolland Dudemaine2011-02-221-0/+1
| |/ |/|
* | 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
|\ \ | |/