Rollback a part of integration to BR_QT4_Dev2 11.08.2008:

Bug IPAL20202 Qt4 porting: it is impossible to start application with "-t" option.

diff --git a/bin/envSalome.py b/bin/envSalome.py
index 1d0d61cb6a8a489dc2c39953aecdb3fd106e6627..ed153d41bfb382216b4c620d3245a6960678f0d6 100755 (executable)
--- a/bin/envSalome.py
+++ b/bin/envSalome.py
@@ -39,6 +39,6 @@ sys.argv = argv[1:]
     
 #args, modules_list, modules_root_dir = setenv.get_config()
 #runSalome.set_env(args, modules_list, modules_root_dir)
-setenv.main();
+setenv.main(True);
 
 os.execvp(argv[0],argv)

diff --git a/bin/setenv.py b/bin/setenv.py
index 7bbc61a3467756fddba8062b1a27cb9e1eecd1c1..078f9a3da2f35604bd553b861cbc7c6f769f79bc 100755 (executable)
--- a/bin/setenv.py
+++ b/bin/setenv.py
@@ -281,9 +281,9 @@ def set_env(args, modules_list, modules_root_dir, silent=False):
 
 # -----------------------------------------------------------------------------
 
-def main():
-    args, modules_list, modules_root_dir = get_config()
-    set_env(args, modules_list, modules_root_dir)
+def main(silent=False):
+    args, modules_list, modules_root_dir = get_config(silent=silent)
+    set_env(args, modules_list, modules_root_dir, silent=silent)
     return args
 
 # -----------------------------------------------------------------------------