aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8/qjsvalue.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-06-26 13:33:53 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-26 15:46:07 +0200
commit3fd2415e91c4265da863fd717af5e1fc6f0ddde3 (patch)
tree6a58b68a88d9a2c825189dae8b8a18c03260b261 /src/qml/qml/v8/qjsvalue.cpp
parent8c0b5be80215a23d2236d2ad2d1681aa80499cc8 (diff)
Fix tst_QJSValue::engineDeleted with MSVC
Don't return void in a non-void function :) Change-Id: I467347a9471655d3c3472dbe3690e9d26cad7e46 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qjsvalue.cpp')
-rw-r--r--src/qml/qml/v8/qjsvalue.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/v8/qjsvalue.cpp b/src/qml/qml/v8/qjsvalue.cpp
index ffbc469a76..7a881cfee4 100644
--- a/src/qml/qml/v8/qjsvalue.cpp
+++ b/src/qml/qml/v8/qjsvalue.cpp
@@ -642,6 +642,7 @@ QJSEngine* QJSValue::engine() const
QV4::ExecutionEngine *engine = d->engine;
if (engine)
return engine->v8Engine->publicEngine();
+ return 0;
}
#endif // QT_DEPRECATED