diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-03-11 17:24:12 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-03-16 11:38:09 +0100 |
commit | 9bd33dc7a17996a7f3844e3f28040ccd27da2830 (patch) | |
tree | c8cc6c134c3ac76b1a91d0cb7be24c3bdb065450 /src/qml/qml | |
parent | 7a036af7afbae623372f426d2e062782af9e5643 (diff) |
qqmlimport: Log when no qmldir file is found
Also log when it is found, with the path where it is found.
As a drive-by, add a 'version' label before printing the version of an
imported library. In a static build where some libraries end up with a
version set to 'invalid', it's clearer that the version is invalid,
and not the library.
Change-Id: I998776b13bfe98f1668790419f1102e081878c99
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 22b69dae253981b67124fc38adab666eb2d750be)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qml/qml')
-rw-r--r-- | src/qml/qml/qqmlimport.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlimport_p.h | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 3967ccc970..58ffb8c3a1 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1637,7 +1637,7 @@ QTypeRevision QQmlImports::addLibraryImport( qCDebug(lcQmlImport) << "addLibraryImport:" << qPrintable(baseUrl().toString()) - << uri << version << "as" << prefix; + << uri << "version '" << version << "'" << "as" << prefix; return d->addLibraryImport(uri, prefix, version, qmldirIdentifier, qmldirUrl, flags, importDb, errors); diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h index 5ebd7f2a2e..ba0b6286fd 100644 --- a/src/qml/qml/qqmlimport_p.h +++ b/src/qml/qml/qqmlimport_p.h @@ -42,6 +42,7 @@ #include <QtCore/qurl.h> #include <QtCore/qcoreapplication.h> +#include <QtCore/qloggingcategory.h> #include <QtCore/qset.h> #include <QtCore/qstringlist.h> #include <QtQml/qqmlengine.h> @@ -73,6 +74,8 @@ class QQmlImportDatabase; class QQmlTypeLoader; class QQmlTypeLoaderQmldirContent; +const QLoggingCategory &lcQmlImport(); + namespace QQmlImport { enum RecursionRestriction { PreventRecursion, AllowRecursion }; } @@ -320,6 +323,7 @@ QQmlImportDatabase::LocalQmldirResult QQmlImportDatabase::locateLocalQmldir( const QStringList qmlDirPaths = QQmlImports::completeQmldirPaths( uri, localImportPaths, version); + QString qmldirAbsoluteFilePath; for (QString qmldirPath : qmlDirPaths) { if (hasInterceptors) { const QUrl intercepted = engine->interceptUrl( @@ -333,7 +337,7 @@ QQmlImportDatabase::LocalQmldirResult QQmlImportDatabase::locateLocalQmldir( } } - QString qmldirAbsoluteFilePath = absoluteFilePath(qmldirPath); + qmldirAbsoluteFilePath = absoluteFilePath(qmldirPath); if (!qmldirAbsoluteFilePath.isEmpty()) { QString url; const QString absolutePath = qmldirAbsoluteFilePath.left( @@ -380,6 +384,15 @@ QQmlImportDatabase::LocalQmldirResult QQmlImportDatabase::locateLocalQmldir( cache->qmldirPathUrl = QStringLiteral("intercepted"); } qmldirCache.insert(uri, cache); + + if (result == QmldirNotFound) { + qCDebug(lcQmlImport) + << "locateLocalQmldir:" << qPrintable(uri) << "module's qmldir file not found"; + } + } else { + qCDebug(lcQmlImport) + << "locateLocalQmldir:" << qPrintable(uri) << "module's qmldir found at" + << qmldirAbsoluteFilePath; } return result; |