From cb2e81e44623d4bde8ac9ff6d1a8ded4aef1dd9b Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Mon, 30 Jan 2017 13:52:24 +0100 Subject: [PATCH] remove GDAL_VERSION_MAJOR >= 2 test --- tests/src/core/testqgsinvertedpolygonrenderer.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/src/core/testqgsinvertedpolygonrenderer.cpp b/tests/src/core/testqgsinvertedpolygonrenderer.cpp index c2c1f843cc2..22478b64c95 100644 --- a/tests/src/core/testqgsinvertedpolygonrenderer.cpp +++ b/tests/src/core/testqgsinvertedpolygonrenderer.cpp @@ -50,9 +50,7 @@ class TestQgsInvertedPolygon : public QObject void graduatedSubRenderer(); void preprocess(); void projectionTest(); -#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_MAJOR >= 2 void curvedPolygons(); -#endif private: bool mTestHasError; @@ -149,8 +147,7 @@ void TestQgsInvertedPolygon::projectionTest() mMapSettings.setCrsTransformEnabled( false ); } -#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_MAJOR >= 2 -// This test relies on GDAL support of curved polygons +// This test relies on GDAL support of curved polygons i.e. GDAL >= 2 void TestQgsInvertedPolygon::curvedPolygons() { QString myCurvedPolysFileName = mTestDataDir + "curved_polys.gpkg"; @@ -166,7 +163,6 @@ void TestQgsInvertedPolygon::curvedPolygons() QVERIFY( imageCheck( "inverted_polys_curved" ) ); mMapSettings.setLayers( QStringList() << curvedLayer->id() ); } -#endif // // Private helper functions not called directly by CTest