summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptengine.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-11-20 14:09:29 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-11-20 14:09:29 (GMT)
commit7871ebfc4d2adf2313c7431c9d6fa221a903b81d (patch)
treea7574187277d5615e26ab4a9f4b1b27b8b6e5422 /src/script/api/qscriptengine.cpp
parent4fbf19955d5c018d8f12611d39348b48be3ff006 (diff)
parent991a5ed5a8dc0c81d56c88823bd69d986618d4e5 (diff)
downloadQt-7871ebfc4d2adf2313c7431c9d6fa221a903b81d.zip
Qt-7871ebfc4d2adf2313c7431c9d6fa221a903b81d.tar.gz
Qt-7871ebfc4d2adf2313c7431c9d6fa221a903b81d.tar.bz2
Merge commit 'origin/4.6' into 4.6
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 b06ff0c..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);