From 9bb640625d1e929f8caac34fa0a0fedeef8687ca Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 15 Apr 2016 10:25:59 +0200 Subject: QQmlPropertyCache: Fix developer build with MinGW. Reorder inline functions so that QQmlPropertyCache::ensureResolved() is visible from where it is invoked (QQmlPropertyCache::property()), fixing error: qtdeclarative/src/qml/qml/qqmlpropertycache_p.h:559:26: error: 'QQmlPropertyData* QQmlPropertyCache::ensureResolved(QQmlPropertyData*) const' redeclared without dllimport attribute after being referenced with dll linkage [-Werror] inline QQmlPropertyData *QQmlPropertyCache::ensureResolved(QQmlPropertyData *p) const Change-Id: Id0f0b5b92d377c71f5950011ba993e53d783bfb8 Reviewed-by: Erik Verbruggen --- src/qml/qml/qqmlpropertycache_p.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/qml/qml/qqmlpropertycache_p.h') diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index bb39a5e371..96dbc72f32 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -494,6 +494,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())) @@ -554,14 +562,6 @@ int QQmlPropertyCache::signalOffset() const return signalHandlerIndexCacheStart; } -inline QQmlPropertyData *QQmlPropertyCache::ensureResolved(QQmlPropertyData *p) const -{ - if (p && p->notFullyResolved()) - resolve(p); - - return p; -} - QQmlMetaObject::QQmlMetaObject() { } -- cgit v1.2.3