projects
/
platform
/
upstream
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c0b5be
)
Fix tst_QJSValue::engineDeleted with MSVC
author
Simon Hausmann
<simon.hausmann@digia.com>
Wed, 26 Jun 2013 11:33:53 +0000
(13:33 +0200)
committer
The Qt Project
<gerrit-noreply@qt-project.org>
Wed, 26 Jun 2013 13:46:07 +0000
(15:46 +0200)
Don't return void in a non-void function :)
Change-Id: I467347a9471655d3c3472dbe3690e9d26cad7e46
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/qml/qml/v8/qjsvalue.cpp
patch
|
blob
|
history
diff --git
a/src/qml/qml/v8/qjsvalue.cpp
b/src/qml/qml/v8/qjsvalue.cpp
index
ffbc469
..
7a881cf
100644
(file)
--- 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