From: Charles Yin <charles.yin@nokia.com>
Date: Wed, 9 May 2012 01:50:47 +0000 (+1000)
Subject: Return earlier if script.context() is invalid
X-Git-Tag: upstream/5.2.1~1925
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b15f96c3256264944a39fbf04cc186d980042571;p=platform%2Fupstream%2Fqtdeclarative.git

Return earlier if script.context() is invalid

If script.context() is invalid, the qml expression is invalid too,
so no need to continue contructing the expression at all.

Change-Id: I5a34cf0eb1c2cc0b2bba7eed736073050f3240e9
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
---

diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
index 67a1195..c333df1 100644
--- a/src/qml/qml/qqmlexpression.cpp
+++ b/src/qml/qml/qqmlexpression.cpp
@@ -216,6 +216,10 @@ QQmlExpression::QQmlExpression(const QQmlScriptString &script, QObject *parent)
 : QObject(*new QQmlExpressionPrivate, parent)
 {
     Q_D(QQmlExpression);
+
+    if (!script.context()->isValid())
+        return;
+
     bool defaultConstruction = false;
 
     int id = script.d.data()->bindingId;