sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60674 from nyalldawson/gdal-release-name

Browse Source 
Show GDAL release nickname in about screen
This commit is contained in:
Julien Cabieces 2025-02-20 09:18:23 +01:00 committed by GitHub
commit a96ea4a104
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/PyQt6/core/auto_generated/proj/qgscoordinatereferencesystem.sip.in
View File

@ -15,7 +15,6 @@
class QgsCoordinateReferenceSystem class QgsCoordinateReferenceSystem
{ {
%Docstring(signature="appended") %Docstring(signature="appended")

1
python/core/auto_generated/proj/qgscoordinatereferencesystem.sip.in
View File

@ -15,7 +15,6 @@
class QgsCoordinateReferenceSystem class QgsCoordinateReferenceSystem
{ {
%Docstring(signature="appended") %Docstring(signature="appended")

12
src/app/qgisapp.cpp
View File

@ -5505,11 +5505,21 @@ QString QgisApp::getVersionString()
// GDAL version // GDAL version
const QString gdalVersionCompiled { GDAL_RELEASE_NAME }; const QString gdalVersionCompiled { GDAL_RELEASE_NAME };
const QString gdalVersionRunning { GDALVersionInfo( "RELEASE_NAME" ) }; const QString gdalVersionRunning { GDALVersionInfo( "RELEASE_NAME" ) };
versionString += QStringLiteral( "<td>%1</td><td>%2" ).arg( tr( "GDAL/OGR version" ), gdalVersionCompiled ); #if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION( 3, 11, 0 )
const QString gdalReleaseNickName { GDAL_RELEASE_NICKNAME };
#else
const QString gdalReleaseNickName;
#endif
versionString += QStringLiteral( "<td>%1</td><td>%2" ).arg( tr( "GDAL version" ), gdalVersionCompiled );
if ( gdalVersionCompiled != gdalVersionRunning ) if ( gdalVersionCompiled != gdalVersionRunning )
{ {
versionString += QStringLiteral( " (%1)<br/>%2 (%3)" ).arg( compLabel, gdalVersionRunning, runLabel ); versionString += QStringLiteral( " (%1)<br/>%2 (%3)" ).arg( compLabel, gdalVersionRunning, runLabel );
} }
if ( !gdalReleaseNickName.isEmpty() )
{
versionString += QStringLiteral( " — <i>%1</i>" ).arg( gdalReleaseNickName );
}
versionString += QLatin1String( "</td></tr><tr>" ); versionString += QLatin1String( "</td></tr><tr>" );
// proj // proj

6
src/core/proj/qgscoordinatereferencesystem.h
View File

@ -55,12 +55,6 @@ typedef struct pj_ctx PJ_CONTEXT;
// forward declaration for sqlite3 // forward declaration for sqlite3
typedef struct sqlite3 sqlite3 SIP_SKIP; typedef struct sqlite3 sqlite3 SIP_SKIP;
#ifdef DEBUG
typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH SIP_SKIP;
#else
typedef void *OGRSpatialReferenceH SIP_SKIP;
#endif
class QgsCoordinateReferenceSystem; class QgsCoordinateReferenceSystem;
typedef void ( *CUSTOM_CRS_VALIDATION )( QgsCoordinateReferenceSystem & ) SIP_SKIP; typedef void ( *CUSTOM_CRS_VALIDATION )( QgsCoordinateReferenceSystem & ) SIP_SKIP;

6
src/core/proj/qgscoordinatereferencesystem_p.h
View File

@ -35,12 +35,6 @@
#include "qgsprojutils.h" #include "qgsprojutils.h"
#include "qgsreadwritelocker.h" #include "qgsreadwritelocker.h"
#ifdef DEBUG
typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH;
#else
typedef void *OGRSpatialReferenceH;
#endif
class QgsCoordinateReferenceSystemPrivate : public QSharedData class QgsCoordinateReferenceSystemPrivate : public QSharedData
{ {
public: public: