diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-22 18:10:23 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-29 15:51:16 +0200 |
| commit | d8513d338d8537506984a13bf1f4ef6507678286 (patch) | |
| tree | 087b524a17c38a9bfa44849e3c8e45fdeba3423b /src/qml/qml/qqmlimport_p.h | |
| parent | bd1c28a82c2ff955e0d154fac2e2df8d5a110dd7 (diff) | |
Match specific module imports also for versionless QML imports
Previously, if you registered a module import for a specific version X
of a module, and the user imported the module without specifying a
version, the module import would not be carried out even if X was the
version actually imported.
Change-Id: I853ed6f275501cf4cbd4e5a360985e67b07f3773
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlimport_p.h')
| -rw-r--r-- | src/qml/qml/qqmlimport_p.h | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h index b512ed2bae..2697832067 100644 --- a/src/qml/qml/qqmlimport_p.h +++ b/src/qml/qml/qqmlimport_p.h @@ -157,22 +157,23 @@ public: QQmlType::RegistrationType registrationType = QQmlType::AnyRegistrationType) const; - bool addImplicitImport(QQmlImportDatabase *importDb, QList<QQmlError> *errors); + QTypeRevision addImplicitImport( + QQmlImportDatabase *importDb, QList<QQmlError> *errors); bool addInlineComponentImport(QQmlImportInstance *const importInstance, const QString &name, const QUrl importUrl, QQmlType containingType); - bool addFileImport(QQmlImportDatabase *, - const QString& uri, const QString& prefix, QTypeRevision version, - uint flags, QList<QQmlError> *errors); + QTypeRevision addFileImport( + QQmlImportDatabase *, const QString& uri, const QString& prefix, QTypeRevision version, + uint flags, QList<QQmlError> *errors); - bool addLibraryImport(QQmlImportDatabase *importDb, - const QString &uri, const QString &prefix, QTypeRevision version, - const QString &qmldirIdentifier, const QString &qmldirUrl, uint flags, - QList<QQmlError> *errors); + QTypeRevision addLibraryImport( + QQmlImportDatabase *importDb, const QString &uri, const QString &prefix, + QTypeRevision version, const QString &qmldirIdentifier, const QString &qmldirUrl, + uint flags, QList<QQmlError> *errors); - bool updateQmldirContent(QQmlImportDatabase *importDb, - const QString &uri, const QString &prefix, - const QString &qmldirIdentifier, const QString &qmldirUrl, QList<QQmlError> *errors); + QTypeRevision updateQmldirContent( + QQmlImportDatabase *importDb, const QString &uri, const QString &prefix, + const QString &qmldirIdentifier, const QString &qmldirUrl, QList<QQmlError> *errors); enum LocalQmldirResult { QmldirFound, @@ -228,9 +229,9 @@ public: QQmlImportDatabase(QQmlEngine *); ~QQmlImportDatabase(); - bool importDynamicPlugin(const QString &filePath, const QString &uri, - const QString &importNamespace, QTypeRevision version, - bool isOptional, QList<QQmlError> *errors); + QTypeRevision importDynamicPlugin( + const QString &filePath, const QString &uri, const QString &importNamespace, + QTypeRevision version, bool isOptional, QList<QQmlError> *errors); bool removeDynamicPlugin(const QString &filePath); QStringList dynamicPlugins() const; @@ -251,9 +252,9 @@ private: const QString &qmldirPath, const QString &qmldirPluginPath, const QString &baseName, const QStringList &suffixes, const QString &prefix = QString()) const; - bool importStaticPlugin(QObject *instance, const QString &basePath, const QString &uri, - const QString &typeNamespace, QTypeRevision version, - QList<QQmlError> *errors); + QTypeRevision importStaticPlugin( + QObject *instance, const QString &basePath, const QString &uri, + const QString &typeNamespace, QTypeRevision version, QList<QQmlError> *errors); void clearDirCache(); void finalizePlugin(QObject *instance, const QString &path, const QString &uri); |