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

QmlDesigner: crash fix for copy and paste

Browse Source 
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
This commit is contained in:
Thomas Hartmann
2010-04-16 13:44:45 +02:00
parent e59d0134c1
commit de610cac45
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -170,8 +170,9 @@ 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());