diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-10-22 14:26:27 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-10-22 14:26:27 (GMT) |
| commit | 5c90ec109b5aa4e20910cfa54b7f05631bc95d71 (patch) | |
| tree | 1d7109cc5a915e1a98c38f416b70cd9f0349ec62 /src/script/api/qscriptengine.cpp | |
| parent | bff3c3daf29e581cd0b8b990491ff9444c63a3e9 (diff) | |
| parent | dbff78d964d1a034459074f168b505b41bab0c98 (diff) | |
| download | Qt-5c90ec109b5aa4e20910cfa54b7f05631bc95d71.zip Qt-5c90ec109b5aa4e20910cfa54b7f05631bc95d71.tar.gz Qt-5c90ec109b5aa4e20910cfa54b7f05631bc95d71.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 360036a..3f2c9b4 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -797,6 +797,10 @@ QScriptEnginePrivate::QScriptEnginePrivate() registeredScriptStrings(0), inEval(false) { qMetaTypeId<QScriptValue>(); + qMetaTypeId<QList<int> >(); +#ifndef QT_NO_QOBJECT + qMetaTypeId<QObjectList>(); +#endif JSC::initializeThreading(); // ### hmmm @@ -2573,7 +2577,7 @@ QScriptValue QScriptEnginePrivate::create(int type, const void *ptr) #endif break; case QMetaType::Double: - result = QScriptValue(*reinterpret_cast<const double*>(ptr)); + result = QScriptValue(qsreal(*reinterpret_cast<const double*>(ptr))); break; case QMetaType::QString: result = QScriptValue(q_func(), *reinterpret_cast<const QString*>(ptr)); |