Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
010e6a9e
Commit
010e6a9e
authored
Jun 10, 2010
by
Kai Koehne
Browse files
Revert "QmlDesigner: crash fix for copy and paste"
Enable correct handling of imports again. This reverts commit
de610cac
.
parent
2fa6d31a
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
View file @
010e6a9e
...
...
@@ -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
());
...
...
src/plugins/qmldesigner/designercore/model/modelmerger.cpp
View file @
010e6a9e
...
...
@@ -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
());
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment