NRI : Merge from V1_2.

diff --git a/src/SALOMEGUI/QAD_RightFrame.cxx b/src/SALOMEGUI/QAD_RightFrame.cxx
index 1dea45a20aa9607f7d416951524bef3b1cc921d4..ed7633da49811ea9547b9af9fa7481a3b203e3bb 100644 (file)
--- a/src/SALOMEGUI/QAD_RightFrame.cxx
+++ b/src/SALOMEGUI/QAD_RightFrame.cxx
@@ -74,6 +74,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libOCCViewer.dll" ;
 #else
@@ -93,6 +95,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libOCCViewer.dll" ;
 #else
@@ -114,6 +118,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "salome" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libOCCViewer.dll" ;
 #else
@@ -134,6 +140,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libVTKViewer.dll" ;
 #else
@@ -153,6 +161,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libVTKViewer.dll" ;
 #else
@@ -174,6 +184,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "salome" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libVTKViewer.dll" ;
 #else
@@ -193,6 +205,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libSUPERVGraph.dll" ;
 #else
@@ -212,6 +226,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libSUPERVGraph.dll" ;
 #else
@@ -252,6 +268,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libPlot2d.dll" ;
 #else
@@ -271,6 +289,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libPlot2d.dll" ;
 #else