From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Fri, 2 Dec 2011 08:30:48 +0000 (+0100)
Subject: qmlplugindump: Fix missing flush for objects that don't fit a line.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=e01219b77b1e889e70437635905d7ff820568e23;p=konrad%2Fqtdeclarative.git

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>
---

diff --git a/tools/qmlplugindump/qmlstreamwriter.cpp b/tools/qmlplugindump/qmlstreamwriter.cpp
index a5c110e..50be165 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");