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

diff --git a/bin/gui_setenv.py b/bin/gui_setenv.py
index 5a4a44be37df54a0df354c9a3e41ecb7996f9f22..ec98f1bc8b3bafb40998b77c63b0b8624434be37 100644 (file)
--- 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
-
-

diff --git a/src/GraphicsView/GraphicsView_Viewer.cxx b/src/GraphicsView/GraphicsView_Viewer.cxx
index 4202a633211c8a5d0b7a74d3e51ce38389b88a3c..a8e1511b2c360aec3bb3d834f2eda335abd788f5 100644 (file)
--- a/src/GraphicsView/GraphicsView_Viewer.cxx
+++ b/src/GraphicsView/GraphicsView_Viewer.cxx
@@ -37,6 +37,8 @@
 #include <QKeyEvent>
 #include <QMenu>
 
+#include <math.h>
+
 // testing ImageViewer
 /*
 #include "GraphicsView_PrsImage.h"