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

QmlDesigner.propertyEditor: end all transactions before detaching

Browse Source
This commit is contained in:
Thomas Hartmann
2010-04-13 15:03:38 +02:00
parent 31b60b45b7
commit 5c79e84569
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
View File

@@ -398,6 +398,7 @@ void PropertyEditor::changeValue(const QString &propertyName)
castedValue = QVariant(newColor); castedValue = QVariant(newColor);
} }
qDebug() << value->value();
try { try {
if (!value->value().isValid()) { //reset if (!value->value().isValid()) { //reset
fxObjectNode.removeVariantProperty(propertyName); fxObjectNode.removeVariantProperty(propertyName);
@@ -787,6 +788,7 @@ void PropertyEditor::modelAttached(Model *model)
void PropertyEditor::modelAboutToBeDetached(Model *model) void PropertyEditor::modelAboutToBeDetached(Model *model)
{ {
QmlModelView::modelAboutToBeDetached(model); QmlModelView::modelAboutToBeDetached(model);
m_currentType->m_propertyEditorTransaction->end();
resetView(); resetView();
} }