summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2010-04-16 13:44:45 +0200
committercon <qtc-committer@nokia.com>2010-04-16 16:34:19 +0200
commitcf06801cd0ea3cba657c1112a0a03d0c2612fbb7 (patch)
tree9a379faba7f8af66ae3934c852aacf0ad661746b
parenta3f2f16d5ced9a2749cc63db0edb1bff609b7619 (diff)
downloadqt-creator-cf06801cd0ea3cba657c1112a0a03d0c2612fbb7.tar.gz
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 (cherry picked from commit de610cac45f227d7c15015000d6e32d5dc614e09)
-rw-r--r--src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp2
-rw-r--r--src/plugins/qmldesigner/core/model/modelmerger.cpp5
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 0078f2c1e3..69d25d8de8 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 7e9290cda7..922e8c88e3 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());