diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-04 16:14:45 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-04 16:14:45 +0200 |
commit | 944b6878df86a81f03377625b2be2797c2e13b9b (patch) | |
tree | 80ace12e33f7a4187a0509949cc7bcdd6a02f856 /src/qml/qml/qqmlpropertycache_p.h | |
parent | 8f7b36f8999f5f906d6a425d6e54c6c86be4c77e (diff) | |
parent | 9bb640625d1e929f8caac34fa0a0fedeef8687ca (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I694ac053b53b669ef5578fd0074de5ce109f7a09
Diffstat (limited to 'src/qml/qml/qqmlpropertycache_p.h')
-rw-r--r-- | src/qml/qml/qqmlpropertycache_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index 4fb84198d9..b2171dd86b 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -496,6 +496,14 @@ int QQmlPropertyRawData::encodedIndex() const return isValueTypeVirtual()?QQmlPropertyData::encodeValueTypePropertyIndex(coreIndex, valueTypeCoreIndex):coreIndex; } +inline QQmlPropertyData *QQmlPropertyCache::ensureResolved(QQmlPropertyData *p) const +{ + if (p && p->notFullyResolved()) + resolve(p); + + return p; +} + inline QQmlPropertyData *QQmlPropertyCache::property(int index) const { if (index < 0 || index >= (propertyIndexCacheStart + propertyIndexCache.count())) @@ -556,14 +564,6 @@ int QQmlPropertyCache::signalOffset() const return signalHandlerIndexCacheStart; } -inline QQmlPropertyData *QQmlPropertyCache::ensureResolved(QQmlPropertyData *p) const -{ - if (p && p->notFullyResolved()) - resolve(p); - - return p; -} - QQmlMetaObject::QQmlMetaObject() { } |