From 2cfbc2b874ebec52ee76adc60b51dca138827d8c Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Fri, 2 Dec 2011 09:30:48 +0100
Subject: 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)
---
 tools/qmlplugindump/qmlstreamwriter.cpp | 3 +--
 1 file changed, 1 insertion(+), 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");
-- 
cgit v0.12