From 90bbe69aad6292dfb11f59eeb99ea3ba847fe022 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Mon, 14 May 2018 14:08:57 -0400 Subject: [PATCH] fix QVariant / QString compare --- tests/src/core/testqgssettings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/src/core/testqgssettings.cpp b/tests/src/core/testqgssettings.cpp index e16230c35688..3da66e690e2e 100644 --- a/tests/src/core/testqgssettings.cpp +++ b/tests/src/core/testqgssettings.cpp @@ -61,7 +61,7 @@ void TestQgsSettings::enumValue() QCOMPARE( v3, QgsUnitTypes::LayoutCentimeters ); settings.setEnumValue( QStringLiteral( "qgis/testing/my_value_for_units" ), QgsUnitTypes::LayoutCentimeters ); // auto conversion of old settings (int to str) - QCOMPARE( settings.value( "qgis/testing/my_value_for_units" ), QStringLiteral( "LayoutCentimeters" ) ); + QCOMPARE( settings.value( "qgis/testing/my_value_for_units" ).toString(), QStringLiteral( "LayoutCentimeters" ) ); QgsUnitTypes::LayoutUnit v3s = settings.enumValue( QStringLiteral( "qgis/testing/my_value_for_units" ), QgsUnitTypes::LayoutMeters ); QCOMPARE( v3s, QgsUnitTypes::LayoutCentimeters ); QString v3ss = settings.value( QStringLiteral( "qgis/testing/my_value_for_units" ), QStringLiteral( "myDummyValue" ) ).toString(); @@ -81,7 +81,7 @@ void TestQgsSettings::flagValue() QgsMapLayerProxyModel::Filters v5 = settings.flagValue( QStringLiteral( "qgis/testing/my_value_for_a_flag" ), pointAndLine, QgsSettings::NoSection ); QCOMPARE( v5, pointAndPolygon ); // auto conversion of old settings (int to str) - QCOMPARE( settings.value( "qgis/testing/my_value_for_a_flag" ), QStringLiteral( "PointLayer|PolygonLayer" ) ); + QCOMPARE( settings.value( "qgis/testing/my_value_for_a_flag" ).toString(), QStringLiteral( "PointLayer|PolygonLayer" ) ); settings.setFlagValue( QStringLiteral( "qgis/testing/my_value_for_a_flag_as_string" ), pointAndPolygon, QgsSettings::NoSection ); QgsMapLayerProxyModel::Filters v5s = settings.flagValue( QStringLiteral( "qgis/testing/my_value_for_a_flag_as_string" ), pointAndLine, QgsSettings::NoSection );