summaryrefslogtreecommitdiffstats
path: root/src/script
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-141-3/+13
|\
| * Make qsTr work in global scopeKent Hansen2010-04-131-3/+13
* | Fix crash on QScriptProgram destructionAaron Kennedy2010-04-121-0/+4
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-092-4/+17
|\ \ | |/
| * Regressions in Global Object prototype accessKent Hansen2010-04-092-4/+17
* | QScript: more missing APIShimOlivier Goffart2010-04-011-0/+2
* | QScript: fix compilation warningOlivier Goffart2010-04-011-1/+1
* | QScript: fix APIShim usage.Olivier Goffart2010-04-011-1/+1
* | QtScript: remove duplicated APIshim in QScriptValueIteratorOlivier Goffart2010-04-011-6/+0
* | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-016-6/+68
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-306-7/+71
| |\ \
| | * | QtScript: Add yet more missing API shimsKent Hansen2010-03-264-4/+65
| | * | QtScript: Make sure the old identifier table is restoredKent Hansen2010-03-263-3/+6
* | | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-301-3/+9
|\ \ \ \ | |/ / /
| * | | Correctly construct boolean JSValue'sAaron Kennedy2010-03-301-3/+9
| |/ /
* | | QScript: More missing APIShimOlivier Goffart2010-03-291-0/+4
* | | QScriptEngine: Fix reentrency involving creation and desctructions of QScript...Olivier Goffart2010-03-293-24/+80
|/ /
* | QtScript: Add missing API shim for signal handlingKent Hansen2010-03-261-0/+1
* | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-254-3/+62
* | QtScript: Add QObjectWrapOption for not exposing slotsKent Hansen2010-03-243-1/+4
* | QtScript: Add more missing API shimsKent Hansen2010-03-242-4/+9
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-221-1/+4
|\ \
| * | Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile an...Thiago Macieira2010-03-201-0/+3
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-191-1/+1
| |\ \
| | * | Fix JSC export macrosKent Hansen2010-03-181-1/+1
* | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-223-5/+6
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | QScriptClass-implemented constructors lead to application crashKent Hansen2010-03-191-1/+3
| * | installTranslatorFunctions doesn't work for custom global objectKent Hansen2010-03-191-1/+1
| * | Don't assert in QScriptValue::call()Kent Hansen2010-03-181-3/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-03-1724-371/+318
|\ \ \ | | |/ | |/|
| * | Define JS_NO_EXPORT to avoid JSC C API functions being exportedKent Hansen2010-03-161-1/+1
| * | Add missing QtScript API shimsKent Hansen2010-03-152-0/+4
| * | QtScript: Improve performance of type resolution when calling slotsKent Hansen2010-03-101-10/+13
| * | Improve performance of QScriptValueIteratorKent Hansen2010-03-101-21/+34
| * | Add default argument values for QScriptValuePrivate property functionsKent Hansen2010-03-102-10/+11
| * | Move method implementation to private classKent Hansen2010-03-102-5/+11
| * | Update src/3rdparty/javascriptcore and adapt src/script to the changesKent Hansen2010-03-1023-325/+245
* | | Merge remote branch 'qt/4.7' into qml-4.7Qt Continuous Integration System2010-03-102-50/+73
|\ \ \ | |/ /
| * | Don't needlessly call pushContext() when reading propertiesKent Hansen2010-03-051-15/+18
| * | QtScript: Don't needlessly make deep copies of function namesKent Hansen2010-03-052-35/+55
* | | Integrate QML's object ownership with the JS collectorAaron Kennedy2010-03-094-0/+25
|/ /
* | QScript: Fix crash when converting a null value to a variant.Olivier Goffart2010-03-041-1/+3
* | QScript: Test against QMetaType::QVariant instead of against the stringOlivier Goffart2010-03-042-28/+20
* | Fixes tst_QScriptExtQObject::connectAndDisconnectOlivier Goffart2010-03-041-8/+6
* | Perform latin1 conversion directly on JSC::UStringKent Hansen2010-03-013-28/+46
* | Avoid conversion between JavaScriptCore String type and QStringKent Hansen2010-03-014-18/+18
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-262-3/+11
|\ \ | |/
| * Fix memory leak when lazily binding QScriptValue to an engineKent Hansen2010-02-222-3/+11
* | QScriptValue::isQMetaObject crash fix.Jedrzej Nowacki2010-02-241-1/+1
* | Second attempt at work-around for MSVC2008 compiler crashKent Hansen2010-02-221-0/+5