Revert "QmlDesigner: crash fix for copy and paste"

Enable correct handling of imports again.
This reverts commit de610cac45f227d7c15015000d6e32d5dc614e09.

diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
index 5c38be2..f68dfa0 100644 (file)
--- 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(Model::create("import Qt 4.7; Qt/Rectangle"));
+    QScopedPointer<Model> 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 922e8c8..7e9290c 100644 (file)
--- 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());