diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-22 11:48:04 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-22 11:48:12 (GMT) |
| commit | 43b2248cc3765848ca3763c36b91ed7290fddfe0 (patch) | |
| tree | 200e2c52c8e44d43c80400079bd2b038609d87df /src/script/api/qscriptengine.cpp | |
| parent | 9c136d34c1d15d077ab5103a84dfb2449b796d1f (diff) | |
| parent | 9dec5247be84ae4606d5d9baf5b99612c5feba8d (diff) | |
| download | Qt-43b2248cc3765848ca3763c36b91ed7290fddfe0.zip Qt-43b2248cc3765848ca3763c36b91ed7290fddfe0.tar.gz Qt-43b2248cc3765848ca3763c36b91ed7290fddfe0.tar.bz2 | |
Merge branch 'origin/4.6' into widgets-team/4.6
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 |