Merge branch 'master' into agy/NewPV1_For_850

[modules/gui.git] / bin / gui_setenv.py

diff --git a/bin/gui_setenv.py b/bin/gui_setenv.py
index 5a4a44be37df54a0df354c9a3e41ecb7996f9f22..76ea8027d03b53b7a5b662cbf8e70f362c061555 100644 (file)
--- a/bin/gui_setenv.py
+++ b/bin/gui_setenv.py
@@ -25,11 +25,9 @@ import os, re
 
 def set_env( args ):
     """Add environment required for GUI module"""
-    vtk_overloads_dir = os.path.join( os.getenv( "GUI_ROOT_DIR" ), "lib", "paraview" )
-    dirs = re.split( ":|;", os.getenv( 'VTK_AUTOLOAD_PATH', vtk_overloads_dir ) )
-    if vtk_overloads_dir not in dirs: dirs[0:0] = [vtk_overloads_dir]
-    os.environ['VTK_AUTOLOAD_PATH'] = os.pathsep.join(dirs)
-    os.environ['QT_PLUGIN_PATH'] = ''
+    qt_plugin_dir = os.path.join( os.getenv( "QTDIR" ), "plugins" )
+    dirs = re.split( ":|;", os.getenv( 'QT_PLUGIN_PATH', qt_plugin_dir ) )
+    if qt_plugin_dir not in dirs: dirs[0:0] = [qt_plugin_dir]
+    dirs2 = list(set(dirs))
+    os.environ['QT_PLUGIN_PATH'] = os.pathsep.join(dirs2)
     return
-
-