diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-20 12:45:16 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-20 12:45:16 (GMT) |
| commit | 7b49dee3036603a99e8367f715d6ebde933ab6ba (patch) | |
| tree | 1c0d56f5e487e76c5470aeb9b62f2b033f25836d /src/script/qscriptengine_p.cpp | |
| parent | c6f8b600cb1635bef425b3d2232213fb41ea96bd (diff) | |
| parent | fc6e0155cc3fa9beb3b48704a1effe87a74c2779 (diff) | |
| download | Qt-7b49dee3036603a99e8367f715d6ebde933ab6ba.zip Qt-7b49dee3036603a99e8367f715d6ebde933ab6ba.tar.gz Qt-7b49dee3036603a99e8367f715d6ebde933ab6ba.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/script/qscriptengine_p.cpp')
| -rw-r--r-- | src/script/qscriptengine_p.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/script/qscriptengine_p.cpp b/src/script/qscriptengine_p.cpp index a2e58de..84a420d 100644 --- a/src/script/qscriptengine_p.cpp +++ b/src/script/qscriptengine_p.cpp @@ -1662,6 +1662,11 @@ bool QScriptEnginePrivate::convert(const QScriptValueImpl &value, return false; } +QScriptEngine::DemarshalFunction QScriptEnginePrivate::demarshalFunction(int type) const +{ + return m_customTypes.value(type).demarshal; +} + QScriptValuePrivate *QScriptEnginePrivate::registerValue(const QScriptValueImpl &value) { if (value.isString()) { |