From 850c94c388b489d74a7aeeb331d086ab34b886e8 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Mon, 5 Sep 2011 15:20:50 +0200
Subject: [PATCH] QmlDesigner.modelMerger: fix for imports
Change-Id: Icaae847dab5758655389771cdf662a18e8a8211e
Reviewed-on: http://codereview.qt.nokia.com/4206
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
---
src/plugins/qmldesigner/designercore/model/modelmerger.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
index 0469ca91593..a745c852d30 100644
--- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
@@ -164,7 +164,7 @@ ModelNode ModelMerger::insertModel(const ModelNode &modelNode)
QList<Import> newImports;
foreach (const Import &import, modelNode.model()->imports()) {
- if (!view()->model()->hasImport(import, true)) {
+ if (!view()->model()->hasImport(import, true, true)) {
newImports.append(import);
}
}
--
GitLab