summaryrefslogtreecommitdiffstats
path: root/src/script/qscriptengine.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
|\
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | fix silly typoKent Hansen2009-06-031-1/+1
|/ | | | | | | | | | Yeesh. The function worked for the common case of the argument being a plain script object (obviously, otherwise this would have been discovered sooner), but it would never pick the less expensive path when replacing the QObject pointer of an existing proxy. And if you passed in a QVariant proxy (now who would ever do something like that...?), it would assert.
* Fix regression in qscriptvalue_cast (primitive-->complex type cast)Kent Hansen2009-03-261-1/+2
| | | | | | | | | | | qscriptvalue_cast implementation was changed from 4.4 to 4.5 because of the introduction of QScriptValue constructors that don't take an engine pointer. However, when the old constructors are used, the behavior of qscriptvalue_cast should be as before, which this patch ensures. In short: If we have an engine pointer, use it. Task-number: 248802 Reviewed-by: Ariya Hidayat
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+1879