diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-27 00:25:04 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-27 00:25:04 (GMT) |
| commit | fb5d338236976690312660bc017a8fe1e199326f (patch) | |
| tree | f126ea5dfb367fc5212a62652162b84e86513aa4 /src/corelib | |
| parent | 487c05895751985a695f117fd984d1ecfe7b1252 (diff) | |
| parent | 84f35321b867894470391d4997b5d58e34bce0ed (diff) | |
| download | Qt-fb5d338236976690312660bc017a8fe1e199326f.zip Qt-fb5d338236976690312660bc017a8fe1e199326f.tar.gz Qt-fb5d338236976690312660bc017a8fe1e199326f.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts:
doc/src/declarative/advtutorial.qdoc
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/xml/qxmlstream.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp index 1bf00b8..ae12007 100644 --- a/src/corelib/xml/qxmlstream.cpp +++ b/src/corelib/xml/qxmlstream.cpp @@ -3716,7 +3716,8 @@ void QXmlStreamWriter::writeProcessingInstruction(const QString &target, const Q { Q_D(QXmlStreamWriter); Q_ASSERT(!data.contains(QLatin1String("?>"))); - d->finishStartElement(); + if (!d->finishStartElement(false) && d->autoFormatting) + d->indent(d->tagStack.size()); d->write("<?"); d->write(target); if (!data.isNull()) { |