From e8d4b8982ba6a689a732642045e8c29792cf566d Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Thu, 11 Feb 2010 16:58:42 +0100
Subject: [PATCH] Clearing undo-stack when we have rolled back after a failed
rewrite action.
---
src/plugins/qmldesigner/core/model/rewriterview.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/plugins/qmldesigner/core/model/rewriterview.cpp b/src/plugins/qmldesigner/core/model/rewriterview.cpp
index 05e1c660f4a..cbf2e7fb8b5 100644
--- a/src/plugins/qmldesigner/core/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/core/model/rewriterview.cpp
@@ -434,8 +434,7 @@ void RewriterView::enterErrorState(const QString &errorMessage)
void RewriterView::resetToLastCorrectQml()
{
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());
// m_textToModelMerger->load(lastCorrectQmlSource.toUtf8(), differenceHandler);
m_textToModelMerger->load(m_textModifier->text().toUtf8(), differenceHandler);
--
GitLab