diff options
Diffstat (limited to 'src/qml/qml/qqmlimport_p.h')
| -rw-r--r-- | src/qml/qml/qqmlimport_p.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h index 8a0a4ea4f1..1bdd287690 100644 --- a/src/qml/qml/qqmlimport_p.h +++ b/src/qml/qml/qqmlimport_p.h @@ -87,7 +87,8 @@ struct QQmlImportInstance bool resolveType(QQmlTypeLoader *typeLoader, const QHashedStringRef &type, int *vmajor, int *vminor, QQmlType* type_return, - QString *base = 0, bool *typeRecursionDetected = 0) const; + QString *base = 0, bool *typeRecursionDetected = 0, + QQmlType::RegistrationType = QQmlType::AnyRegistrationType) const; }; class QQmlImportNamespace @@ -102,7 +103,9 @@ public: bool resolveType(QQmlTypeLoader *typeLoader, const QHashedStringRef& type, int *vmajor, int *vminor, QQmlType* type_return, - QString *base = 0, QList<QQmlError> *errors = 0); + QString *base = 0, QList<QQmlError> *errors = 0, + QQmlType::RegistrationType registrationType + = QQmlType::AnyRegistrationType); // Prefix when used as a qualified import. Otherwise empty. QHashedString prefix; @@ -128,10 +131,14 @@ public: QQmlType *type_return, int *version_major, int *version_minor, QQmlImportNamespace **ns_return, - QList<QQmlError> *errors = 0) const; + QList<QQmlError> *errors = 0, + QQmlType::RegistrationType registrationType + = QQmlType::AnyRegistrationType) 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); |