From 3799ecd97312ab0f5a8dc5e6aef4227cef36813a Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 12 Mar 2010 18:03:57 +1000
Subject: Simplify QDeclarativeComponent::creationContext() logic

---
 src/declarative/qml/qdeclarativecomponent.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index d3608c4..07cdd6d 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -405,11 +405,8 @@ QDeclarativeContext *QDeclarativeComponent::creationContext() const
     Q_D(const QDeclarativeComponent);
     if(d->creationContext)
         return d->creationContext;
-    QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(this);
-    if (ddata)
-        return ddata->context;
-    else
-        return 0;
+
+    return qmlContext(this);
 }
 
 /*!
-- 
cgit v0.12