aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2022-10-24 14:18:48 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2022-10-24 11:38:42 +0000
commitccb03494537f66862188d5ef7c256c0625edabfe (patch)
treeef0a92195701a38db966e20e2e6ba58f110b9778
parent920389a660a0ed8210d18d47906c8b67a14a406d (diff)
QmlDesigner: Don't create module import if later version exists
When creating nodes via 3D view context menu, later versions of imported modules are also accepted rather than just the exact required version specified in the ItemLibraryEntry. This fixes the issue of adding duplicate import statements for the same module with different versions. Change-Id: Id8437a1817346839488bea7bf89529cc63f4849f Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
-rw-r--r--src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
index 05189a53cc..0710fde19c 100644
--- a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
@@ -249,7 +249,7 @@ void Edit3DWidget::onCreateAction()
QString::number(entry.majorVersion())
+ QLatin1Char('.')
+ QString::number(entry.minorVersion()));
- if (!m_view->model()->hasImport(import))
+ if (!m_view->model()->hasImport(import, true, true))
m_view->model()->changeImports({import}, {});
int activeScene = m_view->rootModelNode().auxiliaryData("active3dScene@Internal").toInt();