projects
/
profile
/
ivi
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
542a7d1
)
qmlplugindump: Fix missing flush for objects that don't fit a line.
author
Christian Kamm
<christian.d.kamm@nokia.com>
Fri, 2 Dec 2011 08:30:48 +0000
(09:30 +0100)
committer
Qt by Nokia
<qt-info@nokia.com>
Fri, 2 Dec 2011 09:13:40 +0000
(10:13 +0100)
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>
tools/qmlplugindump/qmlstreamwriter.cpp
patch
|
blob
|
history
diff --git
a/tools/qmlplugindump/qmlstreamwriter.cpp
b/tools/qmlplugindump/qmlstreamwriter.cpp
index
a5c110e
..
50be165
100644
(file)
--- 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");