diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2021-08-05 16:27:18 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2021-08-09 08:10:01 +0000 |
| commit | fa1d7958c31bbe541f7705a9741e12999210b978 (patch) | |
| tree | 431981e514a95ba3eddfbba1f2094a4fdaf950e9 /share | |
| parent | 2dfe37f1cf830915b0b265c40a6261be8718d40a (diff) | |
QmlDesigner: Do not generate version number if invalid
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index 7035d8aa4e..ab764a98b3 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"; |