Merge branch 'hydro/imps_2017_salome_83' of ssh://git.salome-platform.org/modules...

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

diff --git a/bin/gui_setenv.py b/bin/gui_setenv.py
index d5a4ef872764d7959373f239eb0fb9648d34ff0f..ec98f1bc8b3bafb40998b77c63b0b8624434be37 100644 (file)
--- a/bin/gui_setenv.py
+++ b/bin/gui_setenv.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -29,6 +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)
+    #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
-
-