mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-18 00:03:05 -04:00
qgis_bench json log fix; QGIS2 settings
This commit is contained in:
parent
082c6bae7d
commit
34adbe7f56
@ -363,7 +363,7 @@ int main( int argc, char *argv[] )
|
|||||||
// Set up the QSettings environment must be done after qapp is created
|
// Set up the QSettings environment must be done after qapp is created
|
||||||
QgsApplication::setOrganizationName( "QuantumGIS" );
|
QgsApplication::setOrganizationName( "QuantumGIS" );
|
||||||
QgsApplication::setOrganizationDomain( "qgis.org" );
|
QgsApplication::setOrganizationDomain( "qgis.org" );
|
||||||
QgsApplication::setApplicationName( "QGIS" );
|
QgsApplication::setApplicationName( "QGIS2" );
|
||||||
|
|
||||||
QgsProviderRegistry::instance( QgsApplication::pluginPath() );
|
QgsProviderRegistry::instance( QgsApplication::pluginPath() );
|
||||||
|
|
||||||
|
@ -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 ) );
|
list.append( space2 + "\"" + i.key() + "\": " + QString( "%1" ).arg( i.value().toDouble(), 0, 'f', 3 ) );
|
||||||
break;
|
break;
|
||||||
case QMetaType::QString:
|
case QMetaType::QString:
|
||||||
list.append( space2 + "\"" + i.key() + "\": \"" + i.value().toString() + "\"" );
|
list.append( space2 + "\"" + i.key() + "\": \"" + i.value().toString().replace("\\","\\\\").replace("\"","\\\"") + "\"" );
|
||||||
break;
|
break;
|
||||||
//case QMetaType::QMap: QMap is not in QMetaType
|
//case QMetaType::QMap: QMap is not in QMetaType
|
||||||
default:
|
default:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user