From fa1d7958c31bbe541f7705a9741e12999210b978 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 5 Aug 2021 16:27:18 +0200 Subject: [PATCH] QmlDesigner: Do not generate version number if invalid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a fallback to create components from source. If the majorVersion is negative we should not generate a version as part of the import. Change-Id: I377b241e8e4c51141d560d7198e5906a9c963b54 Reviewed-by: Qt CI Bot Reviewed-by: Henning Gründl Reviewed-by: Marco Bubke --- .../qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index 7035d8aa4ed..ab764a98b38 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -714,7 +714,10 @@ QObject *ObjectNodeInstance::createPrimitiveFromSource(const QString &typeName, if (parts.isEmpty()) return nullptr; - QString importString = parts.join(".") + " " + QString::number(majorNumber) + "." + QString::number(minorNumber); + QString importString = parts.join("."); + if (majorNumber >= 0) + importString = importString + " " + QString::number(majorNumber) + "." + + QString::number(minorNumber); if (importString == "QtQuick 1.0") /* Workaround for implicit QQml import */ importString = "QtQuick 2.0"; QString source = "import " + importString + "\n" + unqualifiedTypeName + " {\n" + "}\n";