diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-23 04:53:02 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-23 04:53:02 (GMT) |
| commit | ccf9a964f55ce6b7404f2b2fbd9345697d37bea3 (patch) | |
| tree | a5e264ab62fce2664f079ee8fd28e55e85db9218 /src/declarative/qml | |
| parent | 95aa8c8fc76e2309a629b05994a2677b0887140b (diff) | |
| parent | ceebd7298e8d2325956e297c46a965d68c56b02f (diff) | |
| download | Qt-ccf9a964f55ce6b7404f2b2fbd9345697d37bea3.zip Qt-ccf9a964f55ce6b7404f2b2fbd9345697d37bea3.tar.gz Qt-ccf9a964f55ce6b7404f2b2fbd9345697d37bea3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativeworkerscript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp index 10c0b54..a7ed358 100644 --- a/src/declarative/qml/qdeclarativeworkerscript.cpp +++ b/src/declarative/qml/qdeclarativeworkerscript.cpp @@ -201,11 +201,11 @@ QScriptValue QDeclarativeWorkerScriptEnginePrivate::sendMessage(QScriptContext * if (!script) return engine->undefinedValue(); - p->m_lock.lock(); + QMutexLocker(&p->m_lock); + if (script->owner) QCoreApplication::postEvent(script->owner, new WorkerDataEvent(0, scriptValueToVariant(ctxt->argument(0)))); - p->m_lock.unlock(); return engine->undefinedValue(); } |