diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-25 11:17:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-26 15:45:46 +0200 |
| commit | eb0703eb0ff2dac7b630b8b7429db7bd7034c0a5 (patch) | |
| tree | 15059b97c9e8a1641bf0e6dfcb4d949f00f17fe5 /src/qml/types/qquickworkerscript.cpp | |
| parent | 2444fce505e6967324d48a16c4a8947ee527c6a6 (diff) | |
Various build fixes for Windows:
* Fix processor #defines in stack trace generation code
* Fix return type of doEdgeSplitting. It doesn't actually return anything.
* Work around internal compiler error in the array construction in qquickworkerscript.cpp
Change-Id: I8fac4bc2e8ca7447f4eeff260d8502d70ff6faf6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/types/qquickworkerscript.cpp')
| -rw-r--r-- | src/qml/types/qquickworkerscript.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index e1ab6e64e4..1ec6a45fe0 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -231,10 +231,9 @@ void QQuickWorkerScriptEnginePrivate::WorkerEngine::init() QV4::Script createsendscript(m_v4Engine->rootContext, SEND_MESSAGE_CREATE_SCRIPT); QV4::FunctionObject *createsendconstructor = createsendscript.run().asFunctionObject(); - QV4::Value args[] = { - QV4::Value::fromObject(m_v4Engine->newBuiltinFunction(m_v4Engine->rootContext, m_v4Engine->newString(QStringLiteral("sendMessage")), - QQuickWorkerScriptEnginePrivate::sendMessage)) - }; + QV4::Value function = QV4::Value::fromObject(m_v4Engine->newBuiltinFunction(m_v4Engine->rootContext, m_v4Engine->newString(QStringLiteral("sendMessage")), + QQuickWorkerScriptEnginePrivate::sendMessage)); + QV4::Value args[] = { function }; createsend = createsendconstructor->call(global(), args, 1); } |