diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2018-01-23 14:30:09 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-01-28 17:43:09 +0000 |
commit | eace041161a03a849d3896af65493b7885cecc04 (patch) | |
tree | 19f133cc8e7c95c58b73d63834f02f2e4724463e /src/qml/qml/qqmlmetatype.cpp | |
parent | 6ef66a5dfe938a23c67c0aef0d6c7ebc98b8cca8 (diff) |
Get rid of internal QQmlPrivate::CachedQmlUnit interface part 1
Within QtQml we don't need to use this data structure anymore, we can
use its one member directly
Change-Id: Id850e12918257c7af3c97bfef41d1e93578842d2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlmetatype.cpp')
-rw-r--r-- | src/qml/qml/qqmlmetatype.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index 88fdb14f4d..40864de366 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -2538,16 +2538,16 @@ QList<QQmlType> QQmlMetaType::qmlSingletonTypes() return retn; } -const QQmlPrivate::CachedQmlUnit *QQmlMetaType::findCachedCompilationUnit(const QUrl &uri) +const QV4::CompiledData::Unit *QQmlMetaType::findCachedCompilationUnit(const QUrl &uri) { QMutexLocker lock(metaTypeDataLock()); QQmlMetaTypeData *data = metaTypeData(); for (const auto lookup : qAsConst(data->lookupCachedQmlUnit)) { if (const QQmlPrivate::CachedQmlUnit *unit = lookup(uri)) - return unit; + return unit->qmlData; } - return 0; + return nullptr; } /*! |