diff options
| author | Derick Hawcroft <derick.hawcroft@nokia.com> | 2009-11-23 03:36:20 (GMT) |
|---|---|---|
| committer | Derick Hawcroft <derick.hawcroft@nokia.com> | 2009-11-23 03:36:20 (GMT) |
| commit | 0cadaf8932355d1fc9cc560d405a3915aeac7d5a (patch) | |
| tree | f654169a39839dc43a703716fa40fb8d4a63d513 /src/script/api/qscriptengine.cpp | |
| parent | 0186faea383f3f8223bffd1844e5a47ca22770a5 (diff) | |
| parent | c74a5ae953899b9109ef56b2057b094152616480 (diff) | |
| download | Qt-0cadaf8932355d1fc9cc560d405a3915aeac7d5a.zip Qt-0cadaf8932355d1fc9cc560d405a3915aeac7d5a.tar.gz Qt-0cadaf8932355d1fc9cc560d405a3915aeac7d5a.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 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index d519102..dc0e0d0 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -776,7 +776,11 @@ QScriptEnginePrivate::QScriptEnginePrivate() qMetaTypeId<QObjectList>(); #endif - JSC::initializeThreading(); // ### hmmm + if (!QCoreApplication::instance()) { + qFatal("QScriptEngine: Must construct a Q(Core)Application before a QScriptEngine"); + return; + } + JSC::initializeThreading(); globalData = JSC::JSGlobalData::create().releaseRef(); globalData->clientData = new QScript::GlobalClientData(this); @@ -1302,7 +1306,7 @@ QScript::QObjectData *QScriptEnginePrivate::qobjectData(QObject *object) QScript::QObjectData *data = new QScript::QObjectData(this); m_qobjectData.insert(object, data); QObject::connect(object, SIGNAL(destroyed(QObject*)), - q_func(), SLOT(_q_objectDestroyed(QObject *))); + q_func(), SLOT(_q_objectDestroyed(QObject*))); return data; } |