Merge from BR_QT4_Dev1

diff --git a/configure.ac b/configure.ac
index ce460dfa2be41fd4d367994b6b6b9bbd8e5d8173..8ff7688d28a099b1d7a13cae75460b5ca1efeffb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # ================================================================
 #
 #AC_PREREQ(2.59)
-AC_INIT([Salome2 Project], [4.1.3], [paul.rascle@edf.fr], [SalomeKer])
+AC_INIT([Salome2 Project], [5.0.0], [paul.rascle@edf.fr], [SalomeKer])
 
 # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary
 # scripts such as config.guess, install-sh, ...
@@ -14,7 +14,7 @@ AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([tar-pax])
 #AC_CONFIG_HEADER([config.h])
 
-XVERSION=0x040103
+XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
 AC_SUBST(XVERSION)
 
 # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)

diff --git a/src/KERNEL_PY/salome_test.py b/src/KERNEL_PY/salome_test.py
index d18c706e2d0411fb74b701af2797095f144cbb43..94d2b81f0a8cc93770db1632a7e4a1f14f2a473b 100755 (executable)
--- a/src/KERNEL_PY/salome_test.py
+++ b/src/KERNEL_PY/salome_test.py
@@ -237,7 +237,10 @@ print ret
 smesh.Compute(mesh, box)
 sg.updateObjBrowser(1);
 
-if sys.platform        != "win32":
+# SUPERVISOR module is not available since SALOME 5.0 version
+defineSuperV = 0
+
+if (defineSuperV != 0) & (sys.platform != "win32"):
        print
        print "=============  Test      Supervisor      ============================="
        print