support escape syntax. $$qgis_version will be kept and $qgis_version

will be replaced with value
qgis · Jan 10, 2017 · c5b3b1a · c5b3b1a
1 parent f77e677
commit c5b3b1a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/gui/qgshelp.cpp b/src/gui/qgshelp.cpp
@@ -20,6 +20,7 @@
 #include <QFileInfo>
 #include <QTcpSocket>
 #include <QDesktopServices>
+#include <QRegularExpression>
 #include <QNetworkProxy>
 #include <QNetworkProxyFactory>
 
@@ -54,7 +55,8 @@ QUrl QgsHelp::helpUrl( const QString& key )
     fullPath = path;
     Q_FOREACH ( const QString& var, scope->variableNames() )
     {
-      fullPath.replace( QStringLiteral( "$%1" ).arg( var ), scope->variable( var ).toString() );
+      QRegularExpression rx( QStringLiteral( "(?<!\\$)\\$%1" ).arg( var ) );
+      fullPath.replace( rx, scope->variable( var ).toString() );
     }
 
     helpPath = QStringLiteral( "%1/%2" ).arg( fullPath ).arg( key );