summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@trolltech.com>2009-06-09 13:59:43 (GMT)
committerPeter Hartmann <peter.hartmann@trolltech.com>2009-06-24 12:25:43 (GMT)
commitec89755f9c0a79d09ac31d6a7f112285a2dd5888 (patch)
tree5804303dbc8e1196a8562483d1f7151b9c3ecf82 /src
parent127e68d3dc4ff83293d7e364af870e019fe7cd17 (diff)
downloadQt-ec89755f9c0a79d09ac31d6a7f112285a2dd5888.zip
Qt-ec89755f9c0a79d09ac31d6a7f112285a2dd5888.tar.gz
Qt-ec89755f9c0a79d09ac31d6a7f112285a2dd5888.tar.bz2
QXmlStreamWriter: indent comments correctly
before, there was no newline between a comment and a start element. Now, there is and the comment is correctly indented. Task: 256468 Reviewed-by: Frans Englich
Diffstat (limited to 'src')
-rw-r--r--src/corelib/xml/qxmlstream.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp
index f1487f7..1fc2a9f 100644
--- a/src/corelib/xml/qxmlstream.cpp
+++ b/src/corelib/xml/qxmlstream.cpp
@@ -3410,11 +3410,12 @@ void QXmlStreamWriter::writeComment(const QString &text)
{
Q_D(QXmlStreamWriter);
Q_ASSERT(!text.contains(QLatin1String("--")) && !text.endsWith(QLatin1Char('-')));
- if (!d->finishStartElement() && d->autoFormatting)
+ if (!d->finishStartElement(false) && d->autoFormatting)
d->indent(d->tagStack.size());
d->write("<!--");
d->write(text);
d->write("-->");
+ d->inStartElement = d->lastWasStartElement = false;
}