Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	configure.exe
	mkspecs/features/qt.prf

1 files changed, 5 insertions, 1 deletions

diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 57d4b7a..a8956b8 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -985,7 +985,7 @@ bool QTextDocument::isRedoAvailable() const
 int QTextDocument::revision() const
 {
     Q_D(const QTextDocument);
-    return d->undoState;
+    return d->revision;
 }
 
 
@@ -1096,8 +1096,10 @@ void QTextDocument::setPlainText(const QString &text)
     Q_D(QTextDocument);
     bool previousState = d->isUndoRedoEnabled();
     d->enableUndoRedo(false);
+    d->beginEditBlock();
     d->clear();
     QTextCursor(this).insertText(text);
+    d->endEditBlock();
     d->enableUndoRedo(previousState);
 }
 
@@ -1123,8 +1125,10 @@ void QTextDocument::setHtml(const QString &html)
     Q_D(QTextDocument);
     bool previousState = d->isUndoRedoEnabled();
     d->enableUndoRedo(false);
+    d->beginEditBlock();
     d->clear();
     QTextHtmlImporter(this, html, QTextHtmlImporter::ImportToDocument).import();
+    d->endEditBlock();
     d->enableUndoRedo(previousState);
 }