summaryrefslogtreecommitdiffstats
path: root/src/script/api
Commit message (Expand)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-3132-96/+96
* Updated year in copyright headerKai Koehne2014-03-2632-32/+32
* Fix recursive calling of QScriptProgramLars Knoll2014-03-131-1/+1
* Fix QtScript crash on 64bit with JIT.Friedemann Kleint2013-05-031-1/+1
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1332-32/+32
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2932-64/+64
* Revert "Delete JS-owned QML objects right away in the engine dtor."Peter Kümmel2012-09-252-3/+1
* Delete JS-owned QML objects right away in the engine dtor.Thomas McGuire2012-09-142-1/+3
* Fix crash when converting invalid JSValue to stringKent Hansen2012-08-031-0/+2
* Fix crash when accessing QObject properties through activation objectKent Hansen2012-08-021-0/+4
* Update contact information in license headers.Sergio Ahumada2012-08-0132-96/+96
* Various Qt documentation bug fixes (wk 42)artoka2012-01-301-2/+2
* 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-101-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-1132-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