summaryrefslogtreecommitdiffstats
path: root/src/script
Commit message (Expand)AuthorAgeFilesLines
* 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-023-4/+16
|\ \ | |/
| * Don't allow non-Object values to be set as prototypeKent Hansen2011-03-021-2/+6
| * Enable QtScript/JavaScriptCore ASSERTs in debug modeKent Hansen2011-03-011-1/+1
| * 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
* | | Silence GHS compilerRolland Dudemaine2011-02-221-0/+4
| |/ |/|
* | 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
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-084-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 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-102-0/+15
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-042-0/+15
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-302-0/+15
| | |\ \ | | | |/ | | |/|
| | | * Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-272-0/+6
| | | |\
| | | | * Implement property versioning inside the declarative engineAaron Kennedy2011-01-272-0/+6
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-271-1/+0
| | | |\ \ | | | | |/ | | | |/|
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1968-69/+79
| | | |\ \
| | | * | | Symbian compile fixKai Koehne2010-12-171-1/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Yann Bodson2010-11-231-1/+1
| | | |\ \ \
| | | * | | | Small optimization of enum detection in script.Michael Brasser2010-11-122-0/+9
* | | | | | | 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 branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-034-7/+42
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
| | | |_|_|/ | | |/| | |
* | | | | | Bring back "classic" iteration order of QScriptClass propertiesKent Hansen2011-02-031-1/+4
|/ / / / /
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-261-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | QtScript/JSC on Symbian: Enhanced memory allocator for Collector heapKent Hansen2011-01-251-1/+0
| * | | | Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"Kent Hansen2011-01-251-0/+1
| * | | | QtScript/JSC on Symbian: Enhanced memory allocator for Collector heapKent Hansen2011-01-251-1/+0
| | |_|/ | |/| |
* | | | 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-1768-69/+79
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Update copyright year to 2011.Jason McDonald2011-01-1067-69/+69
| * | | Add compiler optimization for QtScript/JSC on SymbianKent Hansen2010-12-281-0/+10
| | |/ | |/|
* | | qt project files: create pkg-config files for mingwMark Brand2011-01-101-1/+1
* | | 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
| |/
generated by cgit v0.12 at 2024-11-30 23:24:19 (GMT)