Skip to content

Commit f9da596

Browse files
committedAug 24, 2018
QVariantMaps always have string keys
1 parent 0274bc8 commit f9da596

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed
 

‎src/core/expression/qgsexpression.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ QString QgsExpression::formatPreviewString( const QVariant &value )
912912
if ( separator.isEmpty() )
913913
separator = QStringLiteral( "," );
914914

915-
mapStr.append( QStringLiteral( " %1: %2" ).arg( quotedValue( it.key() ), formatPreviewString( it.value() ) ) );
915+
mapStr.append( QStringLiteral( " '%1': %2" ).arg( it.key(), formatPreviewString( it.value() ) ) );
916916
if ( mapStr.length() > MAX_PREVIEW - 3 )
917917
{
918918
mapStr = tr( "%1…" ).arg( mapStr.left( MAX_PREVIEW - 2 ) );

‎tests/src/core/testqgsexpression.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3112,11 +3112,11 @@ class TestQgsExpression: public QObject
31123112
QCOMPARE( QgsExpression::formatPreviewString( QVariant( QVariantMap() ) ), QStringLiteral( "{}" ) );
31133113

31143114
QVariantMap map;
3115-
map[1] = "One";
3116-
map[2] = "Two";
3117-
QCOMPARE( QgsExpression::formatPreviewString( QVariant( map ) ), QStringLiteral( "{ 1: 'One', 2: 'Two' }" ) );
3115+
map[QStringLiteral( "1" )] = "One";
3116+
map[QStringLiteral( "2" )] = "Two";
3117+
QCOMPARE( QgsExpression::formatPreviewString( QVariant( map ) ), QStringLiteral( "{ '1': 'One', 2: 'Two' }" ) );
31183118
map[QStringLiteral( "3" )] = "A very long string that is going to be truncated";
3119-
QCOMPARE( QgsExpression::formatPreviewString( QVariant( map ) ), QStringLiteral( "{ 1: 'One', 2: 'Two', '3': 'A very long string that is going to … }" ) );
3119+
QCOMPARE( QgsExpression::formatPreviewString( QVariant( map ) ), QStringLiteral( "{ '1': 'One', '2': 'Two', '3': 'A very long string that is going to … }" ) );
31203120

31213121
QVariantList list;
31223122
list << 1 << 2 << 3;

0 commit comments

Comments
 (0)