sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-09 00:05:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove GDAL_VERSION_MAJOR >= 2 test

Browse Source
This commit is contained in:
Denis Rouzaud 2017-01-30 13:52:24 +01:00
parent 61d3147261
commit cb2e81e446
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/src/core/testqgsinvertedpolygonrenderer.cpp
View File

@ -50,9 +50,7 @@ class TestQgsInvertedPolygon : public QObject
void graduatedSubRenderer(); void graduatedSubRenderer();
void preprocess(); void preprocess();
void projectionTest(); void projectionTest();
#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_MAJOR >= 2
void curvedPolygons(); void curvedPolygons();
#endif
private: private:
bool mTestHasError; bool mTestHasError;
@ -149,8 +147,7 @@ void TestQgsInvertedPolygon::projectionTest()
mMapSettings.setCrsTransformEnabled( false ); mMapSettings.setCrsTransformEnabled( false );
} }
#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_MAJOR >= 2 // This test relies on GDAL support of curved polygons i.e. GDAL >= 2
// This test relies on GDAL support of curved polygons
void TestQgsInvertedPolygon::curvedPolygons() void TestQgsInvertedPolygon::curvedPolygons()
{ {
QString myCurvedPolysFileName = mTestDataDir + "curved_polys.gpkg"; QString myCurvedPolysFileName = mTestDataDir + "curved_polys.gpkg";
@ -166,7 +163,6 @@ void TestQgsInvertedPolygon::curvedPolygons()
QVERIFY( imageCheck( "inverted_polys_curved" ) ); QVERIFY( imageCheck( "inverted_polys_curved" ) );
mMapSettings.setLayers( QStringList() << curvedLayer->id() ); mMapSettings.setLayers( QStringList() << curvedLayer->id() );
} }
#endif
// //
// Private helper functions not called directly by CTest // Private helper functions not called directly by CTest