| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-05-24 | 1 | -9/+9 |
|\ |
|
| * | Removed some superfluous semicolons | Thorbjørn Lindeijer | 2011-05-02 | 1 | -9/+9 |
|
|
* | | Doc: Fixed qdoc warnings. | David Boddie | 2011-05-11 | 1 | -1/+1 |
|/ |
|
* | Fix compilation with QT_NO_ | Tasuku Suzuki | 2011-03-21 | 1 | -0/+6 |
|
|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-03-14 | 1 | -2/+2 |
|\ |
|
| * | Deprecate QScriptValue::UserRange | Kent Hansen | 2011-03-11 | 1 | -1/+1 |
|
|
| * | Deprecate QScriptValue::QObjectMember | Kent Hansen | 2011-03-11 | 1 | -1/+1 |
|
|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-03-02 | 2 | -3/+15 |
|\ \
| |/ |
|
| * | Don't allow non-Object values to be set as prototype | Kent Hansen | 2011-03-02 | 1 | -2/+6 |
|
|
| * | Avoid asserting when computing line number for backtrace | Kent Hansen | 2011-03-01 | 1 | -1/+9 |
|
|
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-01 | 3 | -13/+33 |
|\ \ |
|
| * | | Make QtScript support COLLECT_ON_EVERY_ALLOCATION define | Kent Hansen | 2011-02-25 | 1 | -11/+12 |
|
|
| * | | Add missing API shims to QScriptValue constructors | Kent Hansen | 2011-02-25 | 1 | -0/+5 |
|
|
| * | | Don't crash when marking arguments object of native context | Kent Hansen | 2011-02-25 | 2 | -2/+16 |
|
|
* | | | add missing include | Rolland Dudemaine | 2011-02-22 | 1 | -0/+1 |
| |/
|/| |
|
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-17 | 1 | -3/+1 |
|\ \
| |/ |
|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-14 | 1 | -3/+1 |
| |\ |
|
| | * | Don't leak ScopeChainNode's | Aaron Kennedy | 2011-02-14 | 1 | -3/+1 |
|
|
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 4 | -5/+32 |
|\ \ \
| |/ / |
|
| * | | Don't crash when creating backtrace for built-in JS function (2nd try) | Kent Hansen | 2011-02-08 | 4 | -4/+30 |
|
|
| * | | Don't crash when creating backtrace for built-in JS function | Kent Hansen | 2011-02-03 | 1 | -1/+2 |
| |/ |
|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-02-09 | 1 | -9/+9 |
|\ \ |
|
| * | | QScriptEngine: fix property flags for native functions | Caio Marcelo de Oliveira Filho | 2011-02-09 | 1 | -9/+9 |
|
|
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-01 | 4 | -7/+42 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Invalidate QScriptPrograms when engine is destroyed | Kent Hansen | 2011-01-28 | 4 | -7/+42 |
|
|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-01-17 | 1 | -2/+2 |
|\ \ |
|
| * | | Fix QScriptValueIterator::hasNext and QScriptValueIterator::hasPrevious | Jedrzej Nowacki | 2011-01-17 | 1 | -2/+2 |
|
|
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 32 | -32/+32 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 32 | -32/+32 |
|
|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-25 | 1 | -1/+3 |
|\ \ |
|
| * | | QtScript variant conversion: Convert numbers to (u)int if applicable (reviewe... | Thomas Senyk | 2010-11-25 | 1 | -1/+3 |
|
|
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-25 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Doc: Fixing typo | Sergio Ahumada | 2010-11-16 | 1 | -1/+1 |
|
|
* | | Fix QScriptValue::construct. | Jedrzej Nowacki | 2010-11-22 | 1 | -1/+14 |
|
|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-12 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Fix GC-related crash in QScriptValue::setData() | Kent Hansen | 2010-11-09 | 1 | -0/+1 |
|
|
* | | Make qsTr() work with Unicode (non-Latin-1) strings | Kent Hansen | 2010-11-08 | 1 | -9/+9 |
|
|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-10-30 | 1 | -4/+1 |
|\ \ |
|
| * | | Don't crash when null-pointer is passed to qScriptValueFromValue() | Kent Hansen | 2010-10-29 | 1 | -4/+1 |
|
|
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-29 | 1 | -5/+8 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | QScriptValue::construct(): Don't crash if function throws non-Object | Kent Hansen | 2010-10-28 | 1 | -5/+8 |
|
|
* | | Merge remote branch 'origin/4.7' into master-from-4.7 | Rohan McGovern | 2010-10-04 | 1 | -2/+5 |
|\ \
| |/ |
|
| * | Fix QScriptEngine::abortEvaluation. | Jedrzej Nowacki | 2010-09-30 | 1 | -2/+5 |
|
|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-21 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Merge commit 'staging-1/4.7' into doc-4.7 | Morten Engvoldsen | 2010-09-03 | 2 | -5/+2 |
| |\ |
|
| * | | Fixed spelling, broken links, and missing default values. | Jerome Pasion | 2010-08-30 | 1 | -1/+1 |
|
|
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-10 | 2 | -5/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | doc: Remove \internal tag from QScriptProgram | Kent Hansen | 2010-08-31 | 2 | -5/+2 |
| |/ |
|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-30 | 1 | -0/+28 |
|\ \
| |/ |
|
| * | Make qsTrId() / QT_TRID_NOOP() accessible from QtScript | Kent Hansen | 2010-08-23 | 1 | -0/+28 |
|
|