Faster sections.

2 files changed, 26 insertions, 0 deletions

diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index c3971ae..445bf03 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -442,6 +442,30 @@ void QmlContext::setContextProperty(const QString &name, QObject *value)
     }
 }
 
+QVariant QmlContext::contextProperty(const QString &name) const
+{
+    Q_D(const QmlContext);
+    QVariant value;
+    int idx = -1;
+    if (d->propertyNames)
+        idx = d->propertyNames->value(name);
+
+    if (idx == -1) {
+        QByteArray utf8Name = name.toUtf8();
+        for (int ii = d->defaultObjects.count() - 1; ii >= 0; --ii) {
+            value = d->defaultObjects.at(ii)->property(utf8Name);
+            if (!value.isValid() && parentContext())
+                value = parentContext()->contextProperty(name);
+            if (value.isValid())
+                break;
+        }
+    } else {
+        value = d->propertyValues[idx];
+    }
+
+    return value;
+}
+
 /*!
     Resolves the URL \a src relative to the URL of the
     containing component.
diff --git a/src/declarative/qml/qmlcontext.h b/src/declarative/qml/qmlcontext.h
index de1d092..7547004 100644
--- a/src/declarative/qml/qmlcontext.h
+++ b/src/declarative/qml/qmlcontext.h
@@ -75,6 +75,8 @@ public:
     void setContextProperty(const QString &, QObject *);
     void setContextProperty(const QString &, const QVariant &);
 
+    QVariant contextProperty(const QString &) const;
+
     QUrl resolvedUrl(const QUrl &);
 
     void setBaseUrl(const QUrl &);