Remove another use of deprecated proj API

qgis · Mar 19, 2019 · 3ce0acc · 3ce0acc
1 parent c2961a8
commit 3ce0acc
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -23,11 +23,11 @@ Email                : sherman at mrcc dot com
 #include "qgis.h"
 #include "qgsvectorlayer.h"
 #include "qgsproject.h"
-
-#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-#endif
+#if PROJ_VERSION_MAJOR > 4
+#include <proj.h>
+#else
 #include <proj_api.h>
+#endif
 #include <gdal.h>
 #include <cpl_conv.h>
 #include <QtTest/QSignalSpy>
@@ -122,7 +122,11 @@ void TestQgsCoordinateReferenceSystem::initTestCase()
   qDebug() << "GEOPROJ4 constant:      " << GEOPROJ4;
   qDebug() << "GDAL version (build):   " << GDAL_RELEASE_NAME;
   qDebug() << "GDAL version (runtime): " << GDALVersionInfo( "RELEASE_NAME" );
+#if PROJ_VERSION_MAJOR > 4
+  qDebug() << "PROJ version:           " << pj_release;
+#else
   qDebug() << "PROJ version:           " << PJ_VERSION;
+#endif
 
   // if user set GDAL_FIX_ESRI_WKT print a warning
   if ( strcmp( CPLGetConfigOption( "GDAL_FIX_ESRI_WKT", "" ), "" ) != 0 )