feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "QmlDesigner: crash fix for copy and paste"

Browse Source 
Enable correct handling of imports again.
This reverts commit de610cac45.
This commit is contained in:
Kai Koehne
2010-06-10 12:03:43 +02:00
parent 2fa6d31ab4
commit 010e6a9ed5
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
View File

@@ -459,7 +459,7 @@ void DesignDocumentController::deleteSelected()
void DesignDocumentController::copySelected() 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->setMetaInfo(m_d->model->metaInfo());
model->setFileUrl(m_d->model->fileUrl()); model->setFileUrl(m_d->model->fileUrl());

5
src/plugins/qmldesigner/designercore/model/modelmerger.cpp
View File

@@ -170,9 +170,8 @@ void ModelMerger::replaceModel(const ModelNode &modelNode)
{ {
RewriterTransaction transaction(view()->beginRewriterTransaction()); RewriterTransaction transaction(view()->beginRewriterTransaction());
foreach (const Import &import, modelNode.model()->imports()) { foreach (const Import &import, modelNode.model()->imports())
//view()->model()->addImport(import); //### view()->model()->addImport(import);
}
view()->model()->setFileUrl(modelNode.model()->fileUrl()); view()->model()->setFileUrl(modelNode.model()->fileUrl());
ModelNode rootNode(view()->rootModelNode()); ModelNode rootNode(view()->rootModelNode());