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:
7b0c981
)
Fix assert
author
Lars Knoll
<lars.knoll@theqtcompany.com>
Sat, 14 Feb 2015 21:46:19 +0000
(22:46 +0100)
committer
Lars Knoll
<lars.knoll@digia.com>
Fri, 20 Mar 2015 11:16:44 +0000
(11:16 +0000)
Change-Id: I4b75a95bd7c59943d06bce7572bc0636b00fc5a9
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
tests/auto/qml/qqmlecmascript/testtypes.h
patch
|
blob
|
history
diff --git
a/tests/auto/qml/qqmlecmascript/testtypes.h
b/tests/auto/qml/qqmlecmascript/testtypes.h
index
bbccf7b
..
eb4a314
100644
(file)
--- a/
tests/auto/qml/qqmlecmascript/testtypes.h
+++ b/
tests/auto/qml/qqmlecmascript/testtypes.h
@@
-1253,7
+1253,7
@@
public:
Q_INVOKABLE void addReference(QObject *other)
{
QQmlData *ddata = QQmlData::get(this);
-
assert
(ddata);
+
Q_ASSERT
(ddata);
QV4::ExecutionEngine *v4 = ddata->jsWrapper.engine();
Q_ASSERT(v4);
QV4::Scope scope(v4);