summaryrefslogtreecommitdiffstats
path: root/src/script
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Work around MSVC2008 compiler crashKent Hansen2010-02-192-1/+27
* | Avoid calling out to public API in the QtScript implementationKent Hansen2010-02-188-359/+513
* | Move property helper functions to QScriptEnginePrivateKent Hansen2010-02-184-206/+288
* | Move more script value conversion code to helper functionsKent Hansen2010-02-182-65/+152
* | Cleanup: Move value conversion code to helper functionsKent Hansen2010-02-183-11/+60
* | Move implementation of QScriptValue construction functions to private classKent Hansen2010-02-182-91/+133
* | Cleanup: Move number conversion functions to QScriptEnginePrivateKent Hansen2010-02-183-84/+81
* | Move some helper function declarations outside QT_NO_QOBJECT guardKent Hansen2010-02-181-13/+14
* | Cleanup: Move exception helper functions to QScriptEnginePrivateKent Hansen2010-02-183-35/+35
* | Optimization: Avoid calling out to public API functionKent Hansen2010-02-151-2/+1
* | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-044-7/+263
|\ \
| * | Compile.Warwick Allison2010-02-031-0/+1
| * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-02-021-4/+9
| |\ \ | | |/
| * | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-201-1/+8
| |\ \
| * \ \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-191-1/+2
| |\ \ \
| * | | | Fix possible crashAaron Kennedy2010-01-152-4/+9
| * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2010-01-1467-70/+233
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-1467-70/+233
| | |\ \ \ \
| * | | | | | Support calling in QScriptDeclarativeClassAaron Kennedy2010-01-144-3/+58
| |/ / / / /
| * | | | | CompileAaron Kennedy2010-01-121-1/+1
| * | | | | Optimization: Add QScriptDeclarativeClass::ValueAaron Kennedy2010-01-113-5/+199