Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 3 insertions, 1 deletions

diff --git a/Plugins/XmlExport/xmlexport.cpp b/Plugins/XmlExport/xmlexport.cpp
index e76fe7d..0cea7df 100644
--- a/Plugins/XmlExport/xmlexport.cpp
+++ b/Plugins/XmlExport/xmlexport.cpp
@@ -103,6 +103,8 @@ bool XmlExport::exportQueryResultsRow(SqlResultsRowPtr row)
             writeln(nullTpl.arg(i));
         else
             writeln(rowTpl.arg(i).arg(escape(value.toString())));
+
+        i++;
     }
 
     decrIndent();
@@ -408,7 +410,7 @@ void XmlExport::writeln(const QString& str)
         QStringList lines = str.split("\n");
         QMutableStringListIterator it(lines);
         while (it.hasNext())
-            it.value().prepend(indentStr);
+            it.next().prepend(indentStr);
 
         newStr = lines.join("\n") + newLineStr;
     }