diff options
author | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2020-09-29 10:04:26 +0200 |
---|---|---|
committer | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2020-10-01 12:35:22 +0000 |
commit | 1b134a69090c7326554157494f89271a5c088ae2 (patch) | |
tree | f5a2e3046f181be970208d9a2a5e01192dcdaa72 | |
parent | f4a11f38fa526b9be9cc11cb81b5205a2af4e2fa (diff) |
QmlJS: accept import without version
Since Qt 6 import without version are accepted and should import
the latest version.
Change-Id: Id98bd0f7664dd77b30b9c91ee153fccc4160fc6d
Fixes: QTCREATORBUG-24533
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r-- | src/libs/qmljs/qmljsbind.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljsbind.cpp b/src/libs/qmljs/qmljsbind.cpp index 5e47353dd8..e405fd3ab5 100644 --- a/src/libs/qmljs/qmljsbind.cpp +++ b/src/libs/qmljs/qmljsbind.cpp @@ -29,6 +29,9 @@ #include "qmljsdocument.h" #include "qmljsmodelmanagerinterface.h" +#include <QtCore/QVersionNumber> +#include <QtCore/QLibraryInfo> + #include <utils/algorithm.h> using namespace LanguageUtils; @@ -203,7 +206,12 @@ bool Bind::visit(UiImport *ast) version = ComponentVersion(ast->version->majorVersion, ast->version->minorVersion); if (ast->importUri) { - if (!version.isValid()) { + QVersionNumber qtVersion = QLibraryInfo::version(); + if (ModelManagerInterface *model = ModelManagerInterface::instance()) { + ModelManagerInterface::ProjectInfo pInfo = model->projectInfoForPath(_doc->fileName()); + qtVersion = QVersionNumber::fromString(pInfo.qtVersionString); + } + if (!version.isValid() && qtVersion.majorVersion() < 6) { _diagnosticMessages->append( errorMessage(ast, tr("package import requires a version number"))); } |