summaryrefslogtreecommitdiffstats
path: root/src/script
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-10-22 11:26:28 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-10-22 11:44:21 (GMT)
commit9dec5247be84ae4606d5d9baf5b99612c5feba8d (patch)
treee8eafa402f5104c959dab69d95018c259f8e1fd7 /src/script
parentc74240bf4ab182f13b18271831fd6deebfe573f6 (diff)
downloadQt-9dec5247be84ae4606d5d9baf5b99612c5feba8d.zip
Qt-9dec5247be84ae4606d5d9baf5b99612c5feba8d.tar.gz
Qt-9dec5247be84ae4606d5d9baf5b99612c5feba8d.tar.bz2
QtScript: Compatibility with 4.5
We must register the same type as they were registered in Qt 4.5 Reported on qt4-preview-feedback mailing list. Reviewed-by: Kent Hansen
Diffstat (limited to 'src/script')
-rw-r--r--src/script/api/qscriptengine.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 360036a..c3c8caf 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