fix regex to correctly handle strings like $$$qgis_version

qgis · Jan 10, 2017 · bcb69c5 · bcb69c5
1 parent c5b3b1a
commit bcb69c5
Showing 1 changed file with 2 additions and 1 deletion.
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 );