fix regex to correctly handle strings like $$$qgis_version

alexbruy · alexbruy · commit bcb69c5f34c2 · 2017-01-10T17:55:53.000+02:00
diff --git a/src/gui/qgshelp.cpp b/src/gui/qgshelp.cpp
@@ -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 );
 

Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,10 @@ QUrl QgsHelp::helpUrl( const QString& key )`
`55`	`55`	`fullPath = path;`
`56`	`56`	`Q_FOREACH ( const QString& var, scope->variableNames() )`
`57`	`57`	`{`
`58`		`- QRegularExpression rx( QStringLiteral( "(?<!\\$)\\$%1" ).arg( var ) );`
	`58`	`+ QRegularExpression rx( QStringLiteral( "(<!\\$\\$)*(\\$%1)" ).arg( var ) );`
`59`	`59`	`fullPath.replace( rx, scope->variable( var ).toString() );`
`60`	`60`	`}`
	`61`	`+ fullPath.replace( QRegularExpression( "(\\$\\$)" ), "$" );`
`61`	`62`
`62`	`63`	`helpPath = QStringLiteral( "%1/%2" ).arg( fullPath ).arg( key );`
`63`	`64`