[QGIS Commit] r12938 - trunk/qgis/src/plugins/grass

[svn_qgis at osgeo.org]

Author: rblazek
Date: 2010-02-12 07:28:11 -0500 (Fri, 12 Feb 2010)
New Revision: 12938

Modified:
   trunk/qgis/src/plugins/grass/qgsgrassshell.cpp
Log:
set GRASS_HTML_BROWSER for term (does not work, overriden by Init.sh

Modified: trunk/qgis/src/plugins/grass/qgsgrassshell.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassshell.cpp	2010-02-12 12:02:26 UTC (rev 12937)
+++ trunk/qgis/src/plugins/grass/qgsgrassshell.cpp	2010-02-12 12:28:11 UTC (rev 12938)
@@ -18,6 +18,7 @@
 #include <QKeySequence>
 
 #include "qgslogger.h"
+#include "qgsapplication.h"
 #include "qtermwidget/qtermwidget.h"
 #include "qgsgrass.h"
 
@@ -108,6 +109,8 @@
   terminal->setShellProgram( shellProgram );
   env << "TERM=vt100";
   env << "GISRC_MODE_MEMORY";
+  // This is also overriden by Init.sh, it should not be run at all, either QGIS is started from shell or a mapset is open from QGIS, Init.sh opens the session second time
+  env << "GRASS_HTML_BROWSER=" + QgsApplication::pkgDataPath() + "/grass/bin/qgis.g.browser";
 
   args << "-text";
   args << QString( "%1/%2/%3" ).arg( QgsGrass::getDefaultGisdbase() ).arg( QgsGrass::getDefaultLocation() ).arg( QgsGrass::getDefaultMapset() );