diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-28 09:46:12 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@digia.com> | 2013-05-28 12:36:10 +0200 |
commit | 59ae55f3fac1d95ce4e47f24a74ea32397511868 (patch) | |
tree | b3639c8b334ffdd4ca95ffb92d3b7f6f02eafeed /src/qml/qml/v8/qqmlbuiltinfunctions_p.h | |
parent | e95c5433de5d22d649f479e3a4117046e21b2ffb (diff) |
Fix crashes in some worker threads auto tests
Replace the crashing use of QV4::ExecutionEngine::publicEngine from within
worker threads (null pointer there) with direct pass-through of the QQmlEngine
pointer. It will be null within worker threads, but that the code can handle.
Change-Id: I8eff9d2cc6ca6f2afd9c0eef203975be9119b9b6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qqmlbuiltinfunctions_p.h')
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h index f3c8ca9532..caa5be86da 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h +++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h @@ -58,6 +58,7 @@ #include <qv4v8_p.h> class QQmlEngine; +class QV8Engine; QT_BEGIN_NAMESPACE @@ -127,7 +128,7 @@ struct ConsoleObject : Object }; struct GlobalExtensions { - static void init(Object *globalObject); + static void init(QQmlEngine *qmlEngine, Object *globalObject); #ifndef QT_NO_TRANSLATION static Value method_qsTranslate(SimpleCallContext *ctx); |