From 6a0266cced3bdc35b81b9b4041db077285e4aa27 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Thu, 20 Feb 2020 12:14:58 +1000 Subject: [PATCH] Update test for proj 6 --- tests/src/core/testqgslayoutmap.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/src/core/testqgslayoutmap.cpp b/tests/src/core/testqgslayoutmap.cpp index c46ded1587d3..c94a7608ecf7 100644 --- a/tests/src/core/testqgslayoutmap.cpp +++ b/tests/src/core/testqgslayoutmap.cpp @@ -652,7 +652,11 @@ void TestQgsLayoutMap::expressionContext() QgsExpression e9( QStringLiteral( "@map_crs_ellipsoid" ) ); r = e9.evaluate( &c ); +#if PROJ_VERSION_MAJOR>=6 + QCOMPARE( r.toString(), QString( "EPSG:7030" ) ); +#else QCOMPARE( r.toString(), QString( "WGS84" ) ); +#endif QgsVectorLayer *layer = new QgsVectorLayer( QStringLiteral( "Point?field=id_a:integer" ), QStringLiteral( "A" ), QStringLiteral( "memory" ) ); QgsVectorLayer *layer2 = new QgsVectorLayer( QStringLiteral( "Point?field=id_a:integer" ), QStringLiteral( "B" ), QStringLiteral( "memory" ) );