diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-22 11:47:59 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-22 11:47:59 (GMT) |
| commit | 93555ce80fbdffeba6dec6065a976269c192b4af (patch) | |
| tree | ed944651a56080c19bb8dc5850a186c22d620768 /src/script/api/qscriptengine.cpp | |
| parent | 90086fc1bae42acefbb792faff6fb76d4934ad41 (diff) | |
| parent | 9dec5247be84ae4606d5d9baf5b99612c5feba8d (diff) | |
| download | Qt-93555ce80fbdffeba6dec6065a976269c192b4af.zip Qt-93555ce80fbdffeba6dec6065a976269c192b4af.tar.gz Qt-93555ce80fbdffeba6dec6065a976269c192b4af.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-driven
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 4 |
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 |