feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: accept import without version

Browse Source 
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>
This commit is contained in:
Fawzi Mohamed
2020-09-29 10:04:26 +02:00
parent f4a11f38fa
commit 1b134a6909
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/qmljs/qmljsbind.cpp
View File

@@ -29,6 +29,9 @@
#include "qmljsdocument.h" #include "qmljsdocument.h"
#include "qmljsmodelmanagerinterface.h" #include "qmljsmodelmanagerinterface.h"
#include <QtCore/QVersionNumber>
#include <QtCore/QLibraryInfo>
#include <utils/algorithm.h> #include <utils/algorithm.h>
using namespace LanguageUtils; using namespace LanguageUtils;
@@ -203,7 +206,12 @@ bool Bind::visit(UiImport *ast)
version = ComponentVersion(ast->version->majorVersion, ast->version->minorVersion); version = ComponentVersion(ast->version->majorVersion, ast->version->minorVersion);
if (ast->importUri) { 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( _diagnosticMessages->append(
errorMessage(ast, tr("package import requires a version number"))); errorMessage(ast, tr("package import requires a version number")));
} }