Optimize QDeclarativePropertyCache

The creation of QDeclarativePropertyCaches contributes significantly
to the initial compile time of a QML app.

Change-Id: Iac5d1578155dfa4678a0e21eab51f4c1675762a9
Reviewed-on: http://codereview.qt.nokia.com/1026
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index bca9c65fcc..32025cc416 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -981,7 +981,8 @@ void QDeclarativeCompiler::genObject(QDeclarativeParser::Object *obj)
                 reinterpret_cast<const QDeclarativeVMEMetaData *>(obj->synthdata.constData());
             for (int ii = 0; ii < vmeMetaData->aliasCount; ++ii) {
                 int index = obj->metaObject()->propertyOffset() + vmeMetaData->propertyCount + ii;
-                propertyCache->property(index)->flags |= QDeclarativePropertyCache::Data::IsAlias;
+                QDeclarativePropertyCache::Data *data = propertyCache->property(index);
+                data->setFlags(data->getFlags() | QDeclarativePropertyCache::Data::IsAlias);
             }
         }
 
@@ -1546,8 +1547,7 @@ bool QDeclarativeCompiler::buildProperty(QDeclarativeParser::Property *prop,
             output->types.at(prop->parent->type).component) {
 
             QDeclarativePropertyCache *cache = output->types.at(prop->parent->type).component->rootPropertyCache;
-            if (cache && cache->property(prop->index) && 
-                cache->property(prop->index)->flags & QDeclarativePropertyCache::Data::IsAlias)
+            if (cache && cache->property(prop->index) && cache->property(prop->index)->isAlias())
                 prop->isAlias = true;
         }
 
@@ -3138,7 +3138,7 @@ int QDeclarativeCompiler::indexOfSignal(QDeclarativeParser::Object *object, cons
         QDeclarativePropertyCache::Data *d = cache->property(strName);
         if (notInRevision) *notInRevision = false;
 
-        while (d && !(d->flags & QDeclarativePropertyCache::Data::IsFunction))
+        while (d && !(d->isFunction()))
             d = cache->overrideData(d);
 
         if (d && !cache->isAllowedInRevision(d)) {
@@ -3178,7 +3178,7 @@ int QDeclarativeCompiler::indexOfProperty(QDeclarativeParser::Object *object, co
 
         QDeclarativePropertyCache::Data *d = cache->property(strName);
         // Find the first property
-        while (d && d->flags & QDeclarativePropertyCache::Data::IsFunction) 
+        while (d && d->isFunction())
             d = cache->overrideData(d);
 
         if (d && !cache->isAllowedInRevision(d)) {