Skip to content
Permalink
Browse files

Merge pull request #9702 from 3nids/release36_proj

fix proj on 3.6
  • Loading branch information
3nids committed Apr 3, 2019
2 parents 60c4a5e + de92b6e commit de9ca7486d3509c00d5bf3cd8a1f7aa27c74acab
Showing with 3 additions and 3 deletions.
  1. +2 −2 src/app/qgisapp.cpp
  2. +1 −1 src/core/processing/qgsprocessingfeedback.cpp
@@ -4511,8 +4511,8 @@ void QgisApp::about()

#ifdef PROJ_HAS_INFO
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</td>" ).arg( info.release );
#else
versionString += "<td>" + tr( "PROJ.4 Version" ) + "</td><td colspan=3>" + QString::number( PJ_VERSION ) + "</td>";
#endif
@@ -67,7 +67,7 @@ void QgsProcessingFeedback::pushVersionInfo()

#if PROJ_VERSION_MAJOR > 4
PJ_INFO info = proj_info();
pushDebugInfo( tr( "PROJ version: %1.%2.%3" ).arg( PROJ_VERSION_MAJOR ).arg( PROJ_VERSION_MINOR ).arg( PROJ_VERSION_PATCH );
pushDebugInfo( tr( "PROJ version: %1" ).arg( info.release ) );
#else
pushDebugInfo( tr( "PROJ version: %1" ).arg( PJ_VERSION ) );
#endif

0 comments on commit de9ca74

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