diff options
| author | Robin Burchell <robin.burchell@crimson.no> | 2017-01-22 12:41:09 +0100 |
|---|---|---|
| committer | Robin Burchell <robin.burchell@crimson.no> | 2017-01-24 17:37:37 +0000 |
| commit | 6d4418243eeb87152ae159eb8e7d45be8a10b6fb (patch) | |
| tree | 7a8b8f21386947103e77f6cfe6db113f8623e10f /src/qml/qml/qqmltypeloader_p.h | |
| parent | b9fe2c2bfd99098ad06154d7fa8c104ac63a1257 (diff) | |
QQmlTypeLoader: Deduplicate type resolution code
Change-Id: I325a0c27f4a851d91876612c5eb2da08bd1fb75e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltypeloader_p.h')
| -rw-r--r-- | src/qml/qml/qqmltypeloader_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index b1d6451974..c60435a2d6 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -456,7 +456,7 @@ private: const QV4::CompiledData::ResolvedTypeReferenceMap &resolvedTypeCache); void createTypeAndPropertyCaches(const QQmlRefPointer<QQmlTypeNameCache> &importCache, const QV4::CompiledData::ResolvedTypeReferenceMap &resolvedTypeCache); - bool resolveType(const QString &typeName, int &majorVersion, int &minorVersion, TypeReference &ref); + bool resolveType(const QString &typeName, int &majorVersion, int &minorVersion, TypeReference &ref, int lineNumber = -1, int columnNumber = -1, bool reportErrors = true); void scriptImported(QQmlScriptBlob *blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace) override; |