summaryrefslogtreecommitdiffstats
path: root/src/script/api
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-11-19 12:00:31 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-11-19 12:07:15 (GMT)
commit8e401cd4ae0133531613a3e097acc57979d78f50 (patch)
tree58e7572913a2c0d38af6a321fc44a5566a9b859d /src/script/api
parenta1e1867ae3cac6b54cd06e9fc0ad1aa0b476fe9d (diff)
parent732e0d01df867200546ddb5e6f8695f263e1ee0d (diff)
downloadQt-8e401cd4ae0133531613a3e097acc57979d78f50.zip
Qt-8e401cd4ae0133531613a3e097acc57979d78f50.tar.gz
Qt-8e401cd4ae0133531613a3e097acc57979d78f50.tar.bz2
Merge branch '4.6' of oslo-staging-1 into 4.6
Diffstat (limited to 'src/script/api')
-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);