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

fix regex to correctly handle strings like $$$qgis_version

Browse Source
This commit is contained in:
Alexander Bruy 2017-01-10 16:11:33 +02:00
parent c5b3b1ac0d
commit bcb69c5f34
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/qgshelp.cpp
View File

@ -55,9 +55,10 @@ QUrl QgsHelp::helpUrl( const QString& key )
fullPath = path;
Q_FOREACH ( const QString& var, scope->variableNames() )
{
QRegularExpression rx( QStringLiteral( "(?<!\\$)\\$%1" ).arg( var ) );
QRegularExpression rx( QStringLiteral( "(<!\\$\\$)*(\\$%1)" ).arg( var ) );
fullPath.replace( rx, scope->variable( var ).toString() );
}
fullPath.replace( QRegularExpression( "(\\$\\$)" ), "$" );
helpPath = QStringLiteral( "%1/%2" ).arg( fullPath ).arg( key );