From a03658663f78437add03b5622858b1470e37cfe3 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Tue, 2 Apr 2019 14:03:25 +0200
Subject: [PATCH] show more verbose PROJ release info

---
 src/app/qgisapp.cpp                           | 2 +-
 src/core/processing/qgsprocessingfeedback.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index a7a6e8959fd..80001e9c509 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -4510,7 +4510,7 @@ void QgisApp::about()
 #if PROJ_VERSION_MAJOR > 4
     PJ_INFO info = proj_info();
     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 );
+    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
diff --git a/src/core/processing/qgsprocessingfeedback.cpp b/src/core/processing/qgsprocessingfeedback.cpp
index 78e020667ed..a9b3d690603 100644
--- a/src/core/processing/qgsprocessingfeedback.cpp
+++ b/src/core/processing/qgsprocessingfeedback.cpp
@@ -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