From 0af187299aa0cc9271336942dcbc0ecb718f6bca Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 6 Apr 2021 18:44:12 +0200 Subject: [PATCH] QmlDesigner: Allow imports without version Change-Id: I67faea759f33d4e8467cf9c16ec2f82b339f0646 Reviewed-by: Marco Bubke --- .../designercore/model/texttomodelmerger.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index fdc0edb2eb0..a751bf5b1f0 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -123,7 +123,7 @@ QStringList knownEnumScopes() bool supportedQtQuickVersion(const QString &version) { - return supportedVersionsList().contains(version); + return version.isEmpty() || supportedVersionsList().contains(version); } QString stripQuotes(const QString &str) @@ -797,11 +797,8 @@ void TextToModelMerger::setupImports(const Document::Ptr &doc, differenceHandler.modelMissesImport(newImport); } else { QString importUri = toString(import->importUri); - if (importUri == QStringLiteral("Qt") && version == QStringLiteral("4.7")) { - importUri = QStringLiteral("QtQuick"); - version = QStringLiteral("1.0"); - } - + if (version.isEmpty()) + version = "2.15"; const Import newImport = Import::createLibraryImport(importUri, version, as, m_rewriterView->importDirectories()); @@ -956,9 +953,13 @@ void TextToModelMerger::setupUsedImports() } for (const QmlJS::Import &import : allImports) { + QString version = import.info.version().toString(); + if (version.isEmpty()) + version = "2.15"; if (!import.info.name().isEmpty() && usedImportsSet.contains(import.info.name())) { if (import.info.type() == ImportType::Library) - usedImports.append(Import::createLibraryImport(import.info.name(), import.info.version().toString(), import.info.as())); + usedImports.append( + Import::createLibraryImport(import.info.name(), version, import.info.as())); else if (import.info.type() == ImportType::Directory || import.info.type() == ImportType::File) usedImports.append(Import::createFileImport(import.info.name(), import.info.version().toString(), import.info.as())); }