summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptengine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
-rw-r--r--src/script/api/qscriptengine.cpp6
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));