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:
cddc706
)
Remove reliance on delayed template parsing.
author
Erik Verbruggen
<erik.verbruggen@me.com>
Wed, 5 Jun 2013 12:51:31 +0000
(14:51 +0200)
committer
Simon Hausmann
<simon.hausmann@digia.com>
Wed, 5 Jun 2013 12:54:24 +0000
(14:54 +0200)
Change-Id: I11e7fd994123de9b947a51001f36dd8bf3938b44
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
src/qml/qml/v4/qv4value_p.h
patch
|
blob
|
history
diff --git
a/src/qml/qml/v4/qv4value_p.h
b/src/qml/qml/v4/qv4value_p.h
index
bbca1ac
..
193b77c
100644
(file)
--- a/
src/qml/qml/v4/qv4value_p.h
+++ b/
src/qml/qml/v4/qv4value_p.h
@@
-270,7
+270,7
@@
struct Q_QML_EXPORT Value
ErrorObject *asErrorObject() const;
template<typename T>
- T *as() const { Managed *m =
asObject()
; return m ? m->as<T>() : 0; }
+ T *as() const { Managed *m =
isObject() ? managed() : 0
; return m ? m->as<T>() : 0; }
uint asArrayIndex() const;
uint asArrayLength(bool *ok) const;