summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authormae <qt-info@nokia.com>2009-09-10 14:44:17 (GMT)
committermae <qt-info@nokia.com>2009-09-10 14:47:25 (GMT)
commit2f8f1f704fb81319714a41bc7d1e4c7b22cfce63 (patch)
tree6bb186ebb8bcc9132af87aa00ab192993afac04c /src/gui/text
parent62f5eac56ddc0ffc4e3ef812c6b593c1d16298bb (diff)
downloadQt-2f8f1f704fb81319714a41bc7d1e4c7b22cfce63.zip
Qt-2f8f1f704fb81319714a41bc7d1e4c7b22cfce63.tar.gz
Qt-2f8f1f704fb81319714a41bc7d1e4c7b22cfce63.tar.bz2
QTextDocument::contentsChanged() was emitted twice for a single
insertion. This was caught by the QSyntaxHighlighter autotest. Reviewed-by: Paul
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qtextdocument_p.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index 566f9c5..7bfdf6c 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -1541,7 +1541,7 @@ void QTextDocumentPrivate::deleteObject(QTextObject *object)
void QTextDocumentPrivate::contentsChanged()
{
Q_Q(QTextDocument);
- if (editBlock)
+ if (editBlock || inEdit)
return;
bool m = undoEnabled ? (modifiedState != undoState) : true;