From: Erik Verbruggen <erik.verbruggen@me.com>
Date: Wed, 5 Jun 2013 12:51:31 +0000 (+0200)
Subject: Remove reliance on delayed template parsing.
X-Git-Tag: upstream/5.2.1~669^2~320
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95c051e42ed1aefe0f1de69fc599c3c88fb1a3a4;p=platform%2Fupstream%2Fqtdeclarative.git

Remove reliance on delayed template parsing.

Change-Id: I11e7fd994123de9b947a51001f36dd8bf3938b44
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---

diff --git a/src/qml/qml/v4/qv4value_p.h b/src/qml/qml/v4/qv4value_p.h
index bbca1ac..193b77c 100644
--- 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;