Skip to content

Commit fe53a39

Browse files
committed
add running GDAL/OGR version to about box
1 parent 9af4ca8 commit fe53a39

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/app/qgisapp.cpp

+7-5
Original file line numberDiff line numberDiff line change
@@ -2138,15 +2138,16 @@ void QgisApp::about()
21382138
versionString += "</tr><tr>";
21392139

21402140
versionString += "<td>" + tr( "Compiled against Qt" ) + "</td><td>" + QT_VERSION_STR + "</td>";
2141-
versionString += "<td>" + tr( "Running against Qt" ) + "</td><td>" + qVersion() + "</td>";
2141+
versionString += "<td>" + tr( "Running against Qt" ) + "</td><td>" + qVersion() + "</td>";
21422142

21432143
versionString += "</tr><tr>";
21442144

2145-
versionString += "<td>" + tr( "GDAL/OGR Version" ) + "</td><td>" + GDAL_RELEASE_NAME + "</td>";
2146-
versionString += "<td>" + tr( "GEOS Version" ) + "</td><td>" + GEOS_VERSION + "</td>";
2145+
versionString += "<td>" + tr( "Compiled against GDAL/OGR" ) + "</td><td>" + GDAL_RELEASE_NAME + "</td>";
2146+
versionString += "<td>" + tr( "Running against GDAL/OGR" ) + "</td><td>" + GDALVersionInfo( "RELEASE_NAME" ) + "</td>";
21472147

21482148
versionString += "</tr><tr>";
21492149

2150+
versionString += "<td>" + tr( "GEOS Version" ) + "</td><td>" + GEOS_VERSION + "</td>";
21502151
versionString += "<td>" + tr( "PostgreSQL Client Version" ) + "</td><td>";
21512152
#ifdef HAVE_POSTGRESQL
21522153
versionString += PG_VERSION;
@@ -2155,6 +2156,8 @@ void QgisApp::about()
21552156
#endif
21562157
versionString += "</td>";
21572158

2159+
versionString += "</tr><tr>";
2160+
21582161
versionString += "<td>" + tr( "SpatiaLite Version" ) + "</td><td>";
21592162
#ifdef HAVE_SPATIALITE
21602163
versionString += spatialite_version();
@@ -2163,12 +2166,11 @@ void QgisApp::about()
21632166
#endif
21642167
versionString += "</td>";
21652168

2166-
versionString += "</tr><tr>";
21672169

21682170
versionString += "<td>" + tr( "QWT Version" ) + "</td><td>" + QWT_VERSION_STR + "</td>";
21692171

21702172
#ifdef QGISDEBUG
2171-
versionString += "<td colspan=2>" + tr( "This copy of QGIS writes debugging output." ) + "</td>";
2173+
versionString += "</tr><tr><td colspan=4>" + tr( "This copy of QGIS writes debugging output." ) + "</td>";
21722174
#endif
21732175

21742176
versionString += "</tr></table></div></body></html>";

0 commit comments

Comments
 (0)