Merge pull request #35948 from agiudiceandrea/patch-1

Fix arguments in QgisApp::about() for exported source code
This commit is contained in:
Even Rouault 2020-04-26 12:47:50 +02:00 committed by GitHub
commit 3b660cef29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5111,8 +5111,16 @@ void QgisApp::about()
if ( QString( Qgis::devVersion() ) == QLatin1String( "exported" ) )
{
versionString += QStringLiteral( "%1</td><td><a href=\"https://github.com/qgis/QGIS/tree/release-%1_%2\">Release %1.%2</a></td>" )
.arg( tr( "QGIS code branch" ) ).arg( Qgis::versionInt() / 10000 ).arg( Qgis::versionInt() / 100 % 100 );
versionString += tr( "QGIS code branch" );
if ( Qgis::version().endsWith( QLatin1String( "Master" ) ) )
{
versionString += QLatin1String( "</td><td><a href=\"https://github.com/qgis/QGIS/tree/master\">master</a></td>" );
}
else
{
versionString += QStringLiteral( "</td><td><a href=\"https://github.com/qgis/QGIS/tree/release-%1_%2\">Release %1.%2</a></td>" )
.arg( Qgis::versionInt() / 10000 ).arg( Qgis::versionInt() / 100 % 100 );
}
}
else
{