From 010e6a9ed5101c8fcea737283e96e317121fcc9f Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 10 Jun 2010 12:03:43 +0200 Subject: [PATCH] Revert "QmlDesigner: crash fix for copy and paste" Enable correct handling of imports again. This reverts commit de610cac45f227d7c15015000d6e32d5dc614e09. --- .../components/integration/designdocumentcontroller.cpp | 2 +- src/plugins/qmldesigner/designercore/model/modelmerger.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp index 5c38be2dcbd..f68dfa0fef4 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp @@ -459,7 +459,7 @@ void DesignDocumentController::deleteSelected() void DesignDocumentController::copySelected() { - QScopedPointer model(Model::create("import Qt 4.7; Qt/Rectangle")); + QScopedPointer model(Model::create("Qt/Rectangle")); model->setMetaInfo(m_d->model->metaInfo()); model->setFileUrl(m_d->model->fileUrl()); diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp index 922e8c88e3b..7e9290cda76 100644 --- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp @@ -170,9 +170,8 @@ 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());