Commit 7b179fea authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

QuickToolBar: critical bugfix

The protype chain is cached in m_prototypes,
but the type might have changed.
We have to check for this case.

Reviewed-by: Lasse Holmstedt
parent 1d7cb01f
...@@ -157,6 +157,13 @@ void QuickToolBar::apply(TextEditor::BaseTextEditorEditable *editor, Document::P ...@@ -157,6 +157,13 @@ void QuickToolBar::apply(TextEditor::BaseTextEditorEditable *editor, Document::P
end = objectBinding->lastSourceLocation().end(); end = objectBinding->lastSourceLocation().end();
} }
if (lookupContext.isNull()) {
if (name != m_oldType)
m_prototypes.clear();
}
m_oldType = name;
m_prototypes.append(name); m_prototypes.append(name);
int line1; int line1;
......
...@@ -53,6 +53,7 @@ private: ...@@ -53,6 +53,7 @@ private:
bool m_blockWriting; bool m_blockWriting;
QStringList m_propertyOrder; QStringList m_propertyOrder;
QStringList m_prototypes; QStringList m_prototypes;
QString m_oldType;
}; };
} //QmlDesigner } //QmlDesigner
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment