From: asl <asl@opencascade.com>
Date: Wed, 1 Nov 2017 09:08:07 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/pre/V8_3_BR' into hydro/imps_2017_salome_83
X-Git-Tag: v2.1~2^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9f57d6054a4065e334d5e0e1b0c887bb754bb5b5;hp=2133dc4fc0252048b4bad5e7fc8d5a4e27ca302d;p=modules%2Fgui.git

Merge remote-tracking branch 'origin/pre/V8_3_BR' into hydro/imps_2017_salome_83
---

diff --git a/bin/gui_setenv.py b/bin/gui_setenv.py
index 5a4a44be3..ec98f1bc8 100644
--- a/bin/gui_setenv.py
+++ b/bin/gui_setenv.py
@@ -29,7 +29,12 @@ def set_env( args ):
     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'] = ''
+    #print 'QT_PLUGIN_PATH: ', 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)
+    #print 'QT_PLUGIN_PATH: ', os.environ['QT_PLUGIN_PATH']
+    #print 'QT_QPA_PLATFORM_PLUGIN_PATH: ', os.environ['QT_QPA_PLATFORM_PLUGIN_PATH']
     return
-
-