From 34adbe7f56f6fb7b59d114de7ab51bbda70ed016 Mon Sep 17 00:00:00 2001
From: Radim Blazek <radim.blazek@gmail.com>
Date: Mon, 8 Apr 2013 09:55:06 +0200
Subject: [PATCH] qgis_bench json log fix; QGIS2 settings

---
 tests/bench/main.cpp     | 2 +-
 tests/bench/qgsbench.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/bench/main.cpp b/tests/bench/main.cpp
index 44455dfc8ed..525d399eed8 100644
--- a/tests/bench/main.cpp
+++ b/tests/bench/main.cpp
@@ -363,7 +363,7 @@ int main( int argc, char *argv[] )
   // Set up the QSettings environment must be done after qapp is created
   QgsApplication::setOrganizationName( "QuantumGIS" );
   QgsApplication::setOrganizationDomain( "qgis.org" );
-  QgsApplication::setApplicationName( "QGIS" );
+  QgsApplication::setApplicationName( "QGIS2" );
 
   QgsProviderRegistry::instance( QgsApplication::pluginPath() );
 
diff --git a/tests/bench/qgsbench.cpp b/tests/bench/qgsbench.cpp
index ba6b430679e..1b6580b6531 100644
--- a/tests/bench/qgsbench.cpp
+++ b/tests/bench/qgsbench.cpp
@@ -299,7 +299,7 @@ QString QgsBench::serialize( QMap<QString, QVariant> theMap, int level )
         list.append( space2 + "\"" + i.key() + "\": " + QString( "%1" ).arg( i.value().toDouble(), 0, 'f', 3 ) );
         break;
       case QMetaType::QString:
-        list.append( space2 + "\"" + i.key() + "\": \"" + i.value().toString() + "\"" );
+        list.append( space2 + "\"" + i.key() + "\": \"" + i.value().toString().replace("\\","\\\\").replace("\"","\\\"") + "\"" );
         break;
         //case QMetaType::QMap: QMap is not in QMetaType
       default: