Skip to content
Permalink
Browse files

Show Python version in about screen and in Processing logs

  • Loading branch information
nyalldawson committed Apr 22, 2021
1 parent 0f9431d commit 45a9309afa124d99715f8fd44a06dc4777823660
Showing with 11 additions and 0 deletions.
  1. +5 −0 cmake_templates/qgsconfig.h.in
  2. +5 −0 src/app/qgisapp.cpp
  3. +1 −0 src/core/processing/qgsprocessingfeedback.cpp
@@ -46,6 +46,11 @@

#define QT_PLUGINS_DIR "${QT_PLUGINS_DIR}"

#define PYTHON_VERSION "${Python_VERSION}"
#define PYTHON_VERSION_MAJOR "${Python_VERSION_MAJOR}"
#define PYTHON_VERSION_MINOR "${Python_VERSION_MINOR}"
#define PYTHON_VERSION_PATCH "${Python_VERSION_PATCH}"

#cmakedefine USING_NMAKE

#cmakedefine USING_NINJA
@@ -5178,6 +5178,11 @@ void QgisApp::about()
}
versionString += QLatin1String( "</tr><tr>" );

// Python version
const QString pythonVersion{ PYTHON_VERSION };
versionString += QStringLiteral( "<td>%1</td><td colspan=\"3\">%2</td>" ).arg( tr( "Python version" ), PYTHON_VERSION );
versionString += QLatin1String( "</tr><tr>" );

// GDAL version
const QString gdalVersionCompiled { GDAL_RELEASE_NAME };
const QString gdalVersionRunning { GDALVersionInfo( "RELEASE_NAME" ) };
@@ -98,6 +98,7 @@ void QgsProcessingFeedback::pushVersionInfo( const QgsProcessingProvider *provid
pushDebugInfo( tr( "QGIS code revision: %1" ).arg( Qgis::devVersion() ) );
}
pushDebugInfo( tr( "Qt version: %1" ).arg( qVersion() ) );
pushDebugInfo( tr( "Python version: %1" ).arg( PYTHON_VERSION ) );
pushDebugInfo( tr( "GDAL version: %1" ).arg( GDALVersionInfo( "RELEASE_NAME" ) ) );
pushDebugInfo( tr( "GEOS version: %1" ).arg( GEOSversion() ) );

0 comments on commit 45a9309

Please sign in to comment.