Skip to content
Permalink
Browse files

Remove some use of deprecated proj API

Sponsored by ICSM
  • Loading branch information
nyalldawson committed Mar 18, 2019
1 parent 09437bb commit c2961a8d5e3bd49a9bbe01cde3465079cb3be9ef
Showing with 4 additions and 6 deletions.
  1. +4 −6 src/app/qgisapp.cpp
@@ -354,11 +354,9 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
#include <gdal_version.h>
#if PROJ_VERSION_MAJOR > 4
#include <proj.h>
#endif
#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
#endif
#else
#include <proj_api.h>
#endif

//
// Other includes
@@ -4511,8 +4509,8 @@ void QgisApp::about()

#if PROJ_VERSION_MAJOR > 4
PJ_INFO info = proj_info();
versionString += "<td>" + tr( "Compiled against PROJ" ) + "</td><td>" + QString::number( PJ_VERSION ) + "</td>";
versionString += "<td>" + tr( "Running against PROJ" ) + "</td><td>" + info.version + "</td>";
versionString += "<td>" + tr( "Compiled against PROJ" ) + QStringLiteral( "</td><td>%1.%2.%3</td>" ).arg( PROJ_VERSION_MAJOR ).arg( PROJ_VERSION_MINOR ).arg( PROJ_VERSION_PATCH );
versionString += "<td>" + tr( "Running against PROJ" ) + QStringLiteral( "</td><td>%1.%2.%3</td>" ).arg( info.major ).arg( info.minor ).arg( info.patch );
#else
versionString += "<td>" + tr( "PROJ.4 Version" ) + "</td><td colspan=3>" + QString::number( PJ_VERSION ) + "</td>";
#endif

0 comments on commit c2961a8

Please sign in to comment.
You can’t perform that action at this time.