From de610cac45f227d7c15015000d6e32d5dc614e09 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Fri, 16 Apr 2010 13:44:45 +0200
Subject: [PATCH] QmlDesigner: crash fix for copy and paste
imports (in the model) are broken (regression)
Since I rely on working imports in copy and paste broke.
I hardcode 4.7 in this patch!
Reviewed-by: Kai Koehne
---
.../components/integration/designdocumentcontroller.cpp | 2 +-
src/plugins/qmldesigner/core/model/modelmerger.cpp | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
index 2adf2a5ec00..c3116af6b74 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
@@ -455,7 +455,7 @@ void DesignDocumentController::deleteSelected()
void DesignDocumentController::copySelected()
{
- QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
+ QScopedPointer<Model> model(Model::create("import Qt 4.7; Qt/Rectangle"));
model->setMetaInfo(m_d->model->metaInfo());
Q_ASSERT(model);
diff --git a/src/plugins/qmldesigner/core/model/modelmerger.cpp b/src/plugins/qmldesigner/core/model/modelmerger.cpp
index 7e9290cda76..922e8c88e3b 100644
--- a/src/plugins/qmldesigner/core/model/modelmerger.cpp
+++ b/src/plugins/qmldesigner/core/model/modelmerger.cpp
@@ -170,8 +170,9 @@ void ModelMerger::replaceModel(const ModelNode &modelNode)
{
RewriterTransaction transaction(view()->beginRewriterTransaction());
- foreach (const Import &import, modelNode.model()->imports())
- view()->model()->addImport(import);
+ foreach (const Import &import, modelNode.model()->imports()) {
+ //view()->model()->addImport(import); //###
+ }
view()->model()->setFileUrl(modelNode.model()->fileUrl());
ModelNode rootNode(view()->rootModelNode());
--
GitLab