| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-22 | 1 | -1/+4 |
|\ |
|
| * | Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile an... | Thiago Macieira | 2010-03-20 | 1 | -0/+3 |
|
|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-19 | 1 | -1/+1 |
| |\ |
|
| | * | Fix JSC export macros | Kent Hansen | 2010-03-18 | 1 | -1/+1 |
|
|
* | | | Merge branch '4.6-s60' into 4.7-s60 | axis | 2010-03-22 | 3 | -5/+6 |
|\ \ \
| |/ /
|/| | |
|
| * | | QScriptClass-implemented constructors lead to application crash | Kent Hansen | 2010-03-19 | 1 | -1/+3 |
|
|
| * | | installTranslatorFunctions doesn't work for custom global object | Kent Hansen | 2010-03-19 | 1 | -1/+1 |
|
|
| * | | Don't assert in QScriptValue::call() | Kent Hansen | 2010-03-18 | 1 | -3/+2 |
|
|
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Alan Alpert | 2010-03-17 | 24 | -371/+318 |
|\ \ \
| | |/
| |/| |
|
| * | | Define JS_NO_EXPORT to avoid JSC C API functions being exported | Kent Hansen | 2010-03-16 | 1 | -1/+1 |
|
|
| * | | Add missing QtScript API shims | Kent Hansen | 2010-03-15 | 2 | -0/+4 |
|
|
| * | | QtScript: Improve performance of type resolution when calling slots | Kent Hansen | 2010-03-10 | 1 | -10/+13 |
|
|
| * | | Improve performance of QScriptValueIterator | Kent Hansen | 2010-03-10 | 1 | -21/+34 |
|
|
| * | | Add default argument values for QScriptValuePrivate property functions | Kent Hansen | 2010-03-10 | 2 | -10/+11 |
|
|
| * | | Move method implementation to private class | Kent Hansen | 2010-03-10 | 2 | -5/+11 |
|
|
| * | | Update src/3rdparty/javascriptcore and adapt src/script to the changes | Kent Hansen | 2010-03-10 | 23 | -325/+245 |
|
|
* | | | Merge remote branch 'qt/4.7' into qml-4.7 | Qt Continuous Integration System | 2010-03-10 | 2 | -50/+73 |
|\ \ \
| |/ / |
|
| * | | Don't needlessly call pushContext() when reading properties | Kent Hansen | 2010-03-05 | 1 | -15/+18 |
|
|
| * | | QtScript: Don't needlessly make deep copies of function names | Kent Hansen | 2010-03-05 | 2 | -35/+55 |
|
|
* | | | Integrate QML's object ownership with the JS collector | Aaron Kennedy | 2010-03-09 | 4 | -0/+25 |
|/ / |
|
* | | QScript: Fix crash when converting a null value to a variant. | Olivier Goffart | 2010-03-04 | 1 | -1/+3 |
|
|
* | | QScript: Test against QMetaType::QVariant instead of against the string | Olivier Goffart | 2010-03-04 | 2 | -28/+20 |
|
|
* | | Fixes tst_QScriptExtQObject::connectAndDisconnect | Olivier Goffart | 2010-03-04 | 1 | -8/+6 |
|
|
* | | Perform latin1 conversion directly on JSC::UString | Kent Hansen | 2010-03-01 | 3 | -28/+46 |
|
|
* | | Avoid conversion between JavaScriptCore String type and QString | Kent Hansen | 2010-03-01 | 4 | -18/+18 |
|
|
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-26 | 2 | -3/+11 |
|\ \
| |/ |
|
| * | Fix memory leak when lazily binding QScriptValue to an engine | Kent Hansen | 2010-02-22 | 2 | -3/+11 |
|
|
* | | QScriptValue::isQMetaObject crash fix. | Jedrzej Nowacki | 2010-02-24 | 1 | -1/+1 |
|
|
* | | Second attempt at work-around for MSVC2008 compiler crash | Kent Hansen | 2010-02-22 | 1 | -0/+5 |
|
|
* | | Work around MSVC2008 compiler crash | Kent Hansen | 2010-02-19 | 2 | -1/+27 |
|
|
* | | Avoid calling out to public API in the QtScript implementation | Kent Hansen | 2010-02-18 | 8 | -359/+513 |
|
|
* | | Move property helper functions to QScriptEnginePrivate | Kent Hansen | 2010-02-18 | 4 | -206/+288 |
|
|
* | | Move more script value conversion code to helper functions | Kent Hansen | 2010-02-18 | 2 | -65/+152 |
|
|
* | | Cleanup: Move value conversion code to helper functions | Kent Hansen | 2010-02-18 | 3 | -11/+60 |
|
|
* | | Move implementation of QScriptValue construction functions to private class | Kent Hansen | 2010-02-18 | 2 | -91/+133 |
|
|
* | | Cleanup: Move number conversion functions to QScriptEnginePrivate | Kent Hansen | 2010-02-18 | 3 | -84/+81 |
|
|
* | | Move some helper function declarations outside QT_NO_QOBJECT guard | Kent Hansen | 2010-02-18 | 1 | -13/+14 |
|
|
* | | Cleanup: Move exception helper functions to QScriptEnginePrivate | Kent Hansen | 2010-02-18 | 3 | -35/+35 |
|
|
* | | Optimization: Avoid calling out to public API function | Kent Hansen | 2010-02-15 | 1 | -2/+1 |
|
|
* | | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso... | Warwick Allison | 2010-02-04 | 4 | -7/+263 |
|\ \ |
|
| * | | Compile. | Warwick Allison | 2010-02-03 | 1 | -0/+1 |
|
|
| * | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-02-02 | 1 | -4/+9 |
| |\ \
| | |/ |
|
| * | | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-20 | 1 | -1/+8 |
| |\ \ |
|
| * \ \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-19 | 1 | -1/+2 |
| |\ \ \ |
|
| * | | | | Fix possible crash | Aaron Kennedy | 2010-01-15 | 2 | -4/+9 |
|
|
| * | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int... | Aaron Kennedy | 2010-01-14 | 67 | -70/+233 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-01-14 | 67 | -70/+233 |
| | |\ \ \ \ |
|
| * | | | | | | Support calling in QScriptDeclarativeClass | Aaron Kennedy | 2010-01-14 | 4 | -3/+58 |
| |/ / / / / |
|
| * | | | | | Compile | Aaron Kennedy | 2010-01-12 | 1 | -1/+1 |
|
|
| * | | | | | Optimization: Add QScriptDeclarativeClass::Value | Aaron Kennedy | 2010-01-11 | 3 | -5/+199 |
|
|