From fecb0a4c83d3d45527ccf721622e97de4222165c Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Fri, 22 Jan 2021 11:04:55 +0100 Subject: [PATCH] qmljs: Suppress "package requires a version number" with unknown Qt Assume Qt6 instead of the version creator was built against when we cannot get the qtVersion one builds against. This is a better default and avoiding spurious warnings for example when building qt. Fixes: QTCREATORBUG-24533 Change-Id: I53dc6387229c510c390b41af8866c2e9b2ece3de Reviewed-by: Thomas Hartmann Reviewed-by: Fabian Kosmale --- src/libs/qmljs/qmljsbind.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/qmljs/qmljsbind.cpp b/src/libs/qmljs/qmljsbind.cpp index 2bcf4246a5b..a29666c0102 100644 --- a/src/libs/qmljs/qmljsbind.cpp +++ b/src/libs/qmljs/qmljsbind.cpp @@ -206,12 +206,12 @@ bool Bind::visit(UiImport *ast) version = ComponentVersion(ast->version->majorVersion, ast->version->minorVersion); if (ast->importUri) { - QVersionNumber qtVersion = QLibraryInfo::version(); + QVersionNumber qtVersion; if (ModelManagerInterface *model = ModelManagerInterface::instance()) { ModelManagerInterface::ProjectInfo pInfo = model->projectInfoForPath(_doc->fileName()); qtVersion = QVersionNumber::fromString(pInfo.qtVersionString); } - if (!version.isValid() && qtVersion.majorVersion() < 6) { + if (version.isValid() && (!qtVersion.isNull() && qtVersion.majorVersion() < 6)) { _diagnosticMessages->append( errorMessage(ast, tr("package import requires a version number"))); }