Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show GDAL release nickname in about screen #60674

Merged
merged 2 commits into from
Feb 20, 2025
Merged

Show GDAL release nickname in about screen #60674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f2bbe4
Fix compilation on GDAL 3.11
nyalldawson Feb 19, 2025
3c210ff
Show GDAL release nickname in about screen on GDAL >= 3.11
nyalldawson Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion python/PyQt6/core/auto_generated/proj/qgscoordinatereferencesystem.sip.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@




class QgsCoordinateReferenceSystem
{
%Docstring(signature="appended")
Expand Down
1 change: 0 additions & 1 deletion python/core/auto_generated/proj/qgscoordinatereferencesystem.sip.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@




class QgsCoordinateReferenceSystem
{
%Docstring(signature="appended")
Expand Down
12 changes: 11 additions & 1 deletion src/app/qgisapp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5505,11 +5505,21 @@ QString QgisApp::getVersionString()
// GDAL version
const QString gdalVersionCompiled { GDAL_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 )
{
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>" );

// proj
Expand Down
6 changes: 0 additions & 6 deletions src/core/proj/qgscoordinatereferencesystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,6 @@ typedef struct pj_ctx PJ_CONTEXT;
// forward declaration for sqlite3
typedef struct sqlite3 sqlite3 SIP_SKIP;

#ifdef DEBUG
typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH SIP_SKIP;
#else
typedef void *OGRSpatialReferenceH SIP_SKIP;
#endif

class QgsCoordinateReferenceSystem;
typedef void ( *CUSTOM_CRS_VALIDATION )( QgsCoordinateReferenceSystem & ) SIP_SKIP;

Expand Down
6 changes: 0 additions & 6 deletions src/core/proj/qgscoordinatereferencesystem_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@
#include "qgsprojutils.h"
#include "qgsreadwritelocker.h"

#ifdef DEBUG
typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH;
#else
typedef void *OGRSpatialReferenceH;
#endif

class QgsCoordinateReferenceSystemPrivate : public QSharedData
{
public:
Expand Down
Loading