diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-23 12:09:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-24 11:13:09 +0200 |
| commit | 15dd1b7883f5dbe66266aeb588381f85f3532ab9 (patch) | |
| tree | 1fa8caa8ec0f38aef39bcf920e3d5c7efeae5cb9 /src/qml/qml/qqmlimport_p.h | |
| parent | f82c4de515223574bcc510de0d993426b22bccbe (diff) | |
| parent | ebceda0cad6d86f6d6fe5efbf85a3b06fb4222b0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/qml/qml/qqmlimport.cpp
src/qml/qml/qqmlimport_p.h
src/qml/qml/qqmltypenamecache.cpp
Done-with: Ulf Hermann<ulf.hermann@qt.io>
Change-Id: I41ba7a592b2659ddf53da6952ea3b456a7bba319
Diffstat (limited to 'src/qml/qml/qqmlimport_p.h')
| -rw-r--r-- | src/qml/qml/qqmlimport_p.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h index a1911515d0..a7b65c1048 100644 --- a/src/qml/qml/qqmlimport_p.h +++ b/src/qml/qml/qqmlimport_p.h @@ -93,6 +93,7 @@ struct QQmlImportInstance bool resolveType(QQmlTypeLoader *typeLoader, const QHashedStringRef &type, int *vmajor, int *vminor, QQmlType* type_return, QString *base = 0, bool *typeRecursionDetected = 0, + QQmlType::RegistrationType = QQmlType::AnyRegistrationType, QQmlImport::RecursionRestriction recursionRestriction = QQmlImport::PreventRecursion) const; }; @@ -109,6 +110,7 @@ public: bool resolveType(QQmlTypeLoader *typeLoader, const QHashedStringRef& type, int *vmajor, int *vminor, QQmlType* type_return, QString *base = 0, QList<QQmlError> *errors = 0, + QQmlType::RegistrationType registrationType = QQmlType::AnyRegistrationType, QQmlImport::RecursionRestriction recursionRestriction = QQmlImport::PreventRecursion); // Prefix when used as a qualified import. Otherwise empty. @@ -136,10 +138,14 @@ public: int *version_major, int *version_minor, QQmlImportNamespace **ns_return, QList<QQmlError> *errors = 0, - QQmlImport::RecursionRestriction recursionRestriction = QQmlImport::PreventRecursion) const; + QQmlType::RegistrationType registrationType = QQmlType::AnyRegistrationType, + QQmlImport::RecursionRestriction recursionRestriction + = QQmlImport::PreventRecursion) const; bool resolveType(QQmlImportNamespace *, const QHashedStringRef& type, - QQmlType *type_return, int *version_major, int *version_minor) const; + QQmlType *type_return, int *version_major, int *version_minor, + QQmlType::RegistrationType registrationType + = QQmlType::AnyRegistrationType) const; bool addImplicitImport(QQmlImportDatabase *importDb, QList<QQmlError> *errors); |