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

QuickToolBar: critical bugfix

Browse Source 
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
This commit is contained in:
Thomas Hartmann
2010-11-11 16:32:46 +01:00
parent 1d7cb01f64
commit 7b179fea73
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmljseditor/quicktoolbar.cpp
View File

@@ -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;

1
src/plugins/qmljseditor/quicktoolbar.h
View File

@@ -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