diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-12-02 08:30:48 (GMT) |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-12-02 11:05:22 (GMT) |
| commit | 2cfbc2b874ebec52ee76adc60b51dca138827d8c (patch) | |
| tree | 38f608f400527e1c8c14cc652faa1c3fc61392e8 /tools | |
| parent | a6ab48bec20a746ae9bd54c1ea8a260af9967c04 (diff) | |
| download | Qt-2cfbc2b874ebec52ee76adc60b51dca138827d8c.zip Qt-2cfbc2b874ebec52ee76adc60b51dca138827d8c.tar.gz Qt-2cfbc2b874ebec52ee76adc60b51dca138827d8c.tar.bz2 | |
qmlplugindump: Fix missing flush for objects that don't fit a line.
The missing flush could result in script bindings appearing after the
closing brace of an object.
Change-Id: If05764619668cc4a86f7364f6cd7feeb0d6f6e32
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
(backported from e01219b77b1e889e70437635905d7ff820568e23)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlplugindump/qmlstreamwriter.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/qmlplugindump/qmlstreamwriter.cpp b/tools/qmlplugindump/qmlstreamwriter.cpp index ca52a7a..48d1b02 100644 --- a/tools/qmlplugindump/qmlstreamwriter.cpp +++ b/tools/qmlplugindump/qmlstreamwriter.cpp @@ -93,8 +93,7 @@ void QmlStreamWriter::writeEndObject() m_pendingLineLength = 0; m_maybeOneline = false; } else { - if (m_maybeOneline) - flushPotentialLinesWithNewlines(); + flushPotentialLinesWithNewlines(); --m_indentDepth; writeIndent(); m_stream->write("}\n"); |