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

Clearing undo-stack when we have rolled back after a failed rewrite action.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-02-11 16:58:42 +01:00
parent 3c1142d7d7
commit e8d4b8982b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/core/model/rewriterview.cpp
View File

@@ -434,8 +434,7 @@ void RewriterView::enterErrorState(const QString &errorMessage)
void RewriterView::resetToLastCorrectQml() void RewriterView::resetToLastCorrectQml()
{ {
m_textModifier->textDocument()->undo(); m_textModifier->textDocument()->undo();
// FIXME: enable the next line when commit 54290ef776a311f0c303e2a8df4de5e39e9a032a shows up in Qt. m_textModifier->textDocument()->clearUndoRedoStacks(QTextDocument::RedoStack);
// m_textModifier->textDocument()->clearUndoRedoStacks(QTextDocument::RedoStack);
ModelAmender differenceHandler(m_textToModelMerger.data()); ModelAmender differenceHandler(m_textToModelMerger.data());
// m_textToModelMerger->load(lastCorrectQmlSource.toUtf8(), differenceHandler); // m_textToModelMerger->load(lastCorrectQmlSource.toUtf8(), differenceHandler);
m_textToModelMerger->load(m_textModifier->text().toUtf8(), differenceHandler); m_textToModelMerger->load(m_textModifier->text().toUtf8(), differenceHandler);