summaryrefslogtreecommitdiffstats
path: root/src/script
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Fix QScriptValue::construct.Jedrzej Nowacki2010-11-221-1/+14
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-122-0/+13
|\ \ | |/
| * Fix GC-related crash in QScriptValue::setData()Kent Hansen2010-11-091-0/+1
| * Don't crash if QScriptClass property getter returns an invalid valueKent Hansen2010-11-081-0/+12
* | 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
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-291-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 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-221-1/+9
|\ \ \ | |_|/ |/| |
| * | Lighthouse on OS X.Morten Johan Sørvig2010-10-201-1/+9
| |/
* | 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-033-6/+6
| |\
| * | 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-103-6/+6
|\ \ \ | | |/ | |/|
| * | Reduce memory consumption of QtScript/JSC on SymbianKent Hansen2010-09-021-1/+4
| * | 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-137-26/+25
|\ \ | |/
| * Fix memory leak in QtScript variable objectKent Hansen2010-08-102-2/+2
| * 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-063-6/+6