summaryrefslogtreecommitdiffstats
path: root/src/script/bridge
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-042-0/+15
|\
| * Implement property versioning inside the declarative engineAaron Kennedy2011-01-272-0/+6
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1920-20/+20
| |\
| * | Symbian compile fixKai Koehne2010-12-171-1/+1
| * | Small optimization of enum detection in script.Michael Brasser2010-11-122-0/+9
* | | Bring back "classic" iteration order of QScriptClass propertiesKent Hansen2011-02-031-1/+4
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1720-20/+20
|\ \ \ | | |/ | |/|
| * | Update copyright year to 2011.Jason McDonald2011-01-1020-20/+20
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-0/+12
|\ \ | |/
| * Don't crash if QScriptClass property getter returns an invalid valueKent Hansen2010-11-081-0/+12
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-132-2/+2
|\ \ | |/
| * Fix memory leak in QtScript variable objectKent Hansen2010-08-102-2/+2
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-062-5/+5
* | Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-061-3/+3
|/
* QScriptDeclarativeObject: we need to save the current stack pointer.Olivier Goffart2010-07-271-2/+2
* Use custom static scopes to improve QML/JavaScript performanceKent Hansen2010-06-255-0/+303
* Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-221-1/+1
|\
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-211-1/+1
| |\
| | * QtScript: regression with instanceof operator for QMetaObject wrappersKent Hansen2010-04-211-1/+1
* | | QScript: use JSC::NativeFunctionWrapper instead of JSC::PrototypeFunction whe...Olivier Goffart2010-04-192-6/+9
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-301-4/+17
|\ \
| * | QtScript: Add yet more missing API shimsKent Hansen2010-03-261-4/+17
* | | Correctly construct boolean JSValue'sAaron Kennedy2010-03-301-3/+9
|/ /
* | QtScript: Add missing API shim for signal handlingKent Hansen2010-03-261-0/+1
* | QtScript: Add QObjectWrapOption for not exposing slotsKent Hansen2010-03-241-1/+2
* | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-1/+3
|\ \ | |/
| * QScriptClass-implemented constructors lead to application crashKent Hansen2010-03-191-1/+3
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-03-1715-306/+197
|\ \
| * | QtScript: Improve performance of type resolution when calling slotsKent Hansen2010-03-101-10/+13
| * | Update src/3rdparty/javascriptcore and adapt src/script to the changesKent Hansen2010-03-1015-296/+184
* | | 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: Test against QMetaType::QVariant instead of against the stringOlivier Goffart2010-03-041-23/+14
* | Fixes tst_QScriptExtQObject::connectAndDisconnectOlivier Goffart2010-03-041-8/+6
* | Perform latin1 conversion directly on JSC::UStringKent Hansen2010-03-011-11/+11
* | Avoid calling out to public API in the QtScript implementationKent Hansen2010-02-184-72/+54
* | Compile.Warwick Allison2010-02-031-0/+1
* | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-201-1/+8
|\ \ | |/
| * Remove QtScript connection when receiver QObject has been deletedKent Hansen2010-01-191-1/+8
* | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-191-1/+2
|\ \ | |/
| * don't assert when calling QtScript-wrapped method of deleted QObjectKent Hansen2010-01-181-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-1418-19/+182
|\ \
| * \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-1418-19/+182
| |\ \ | | |/
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-1118-18/+18
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0718-18/+18
| | | |\
| | | | * Update copyright year to 2010Jason McDonald2010-01-0618-18/+18
| | * | | Correctly determine QScriptValue::isQObject() for QObjects using theMichael Brasser2010-01-112-0/+6
| | |/ /