Merge changes from 'master' branch.

diff --cc cmake/SalomeMacros.cmake
Simple merge

diff --cc cmake/UsePyQt.cmake
index 7927ec13b0968d83d3d4d85c9d650677981499c9,42a528775b72bfc3191e1247cb17fbace0211493..3d9ddca6fc5814ef6fd2dda3af2c8796b3677d75
--- 1/cmake/UsePyQt.cmake
--- 2/cmake/UsePyQt.cmake
+++ b/cmake/UsePyQt.cmake
@@@ -66,31 -65,18 +66,18 @@@ ENDFUNCTION(
  # 
  ####################################################################
  MACRO(PYQT_WRAP_UIC outfiles)
-   SET(_output)
-   SET(_options)
-   SET(_pyuic_files)
-   SET(_get_options "0")
-   FOREACH(_input ${ARGN})
-     IF(${_input} STREQUAL "OPTIONS")
-       SET(_get_options "1")
-     ELSE()
-       IF(${_get_options} STREQUAL "1")
-         SET(_options ${_options} ${_input})
-       ELSE()
-         SET(_pyuic_files ${_pyuic_files} ${_input})
-       ENDIF()
-   ENDIF()
-   ENDFOREACH()
++ SET(_output)
  
-  IF(NOT WIN32)
 - PARSE_ARGUMENTS(PYQT_WRAP_UIC "TARGET_NAME" "" ${ARGN})
++ PARSE_ARGUMENTS(PYQT_WRAP_UIC "TARGET_NAME;OPTIONS" "" ${ARGN})
  
-   FOREACH(_input ${_pyuic_files})
+  IF(NOT WIN32)
 -
+   FOREACH(_input ${PYQT_WRAP_UIC_DEFAULT_ARGS})
      GET_FILENAME_COMPONENT(_input_name ${_input} NAME)
      STRING(REPLACE ".ui" "_ui.py" _input_name ${_input_name})
      SET(_output ${CMAKE_CURRENT_BINARY_DIR}/${_input_name})
      ADD_CUSTOM_COMMAND(
        OUTPUT ${_output}
-       COMMAND ${PYQT_PYUIC_PATH} ${_options} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input}
 -      COMMAND ${PYQT_PYUIC_PATH} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input}
++      COMMAND ${PYQT_PYUIC_PATH} ${PYQT_WRAP_UIC_OPTIONS} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input}
        MAIN_DEPENDENCY ${_input}
        )
      SET(${outfiles} ${${outfiles}} ${_output})

diff --cc config/salome.xml
index 5ddbf9c461d0004e9bd8290c99fa34e8e3d26106,2d96166c22d9a4545482d15bb3203d3ffef27660..06af4c82c1404275777679d1fe14bcfb9c546c0c
--- 1/config/salome.xml
--- 2/config/salome.xml
+++ b/config/salome.xml
@@@ -69,11 -70,11 +71,11 @@@
    </product>
    <product name="nose" version="1.3.7" />
    <product name="numpy" version="1.9.2" />
-   <product name="occt" version="1780d6cc299f1d06eb106f5cfc27731cdaf97a56" />
-   <product name="omninotify" version="4.1.6">
+   <product name="occt" version="88af3920" />
+   <product name="omniorb" version="4.1.6">
      <patches>
 -      <patch comment="Fix compilation issues" name="omniorb.001_omninotify_compilation.patch" />
 -      <patch comment="Fix for 64 bits platforms" name="omniorb.002_omninotify_64bits.patch" />
 +      <patch comment="Fix compilation issues" name="omninotify.001_compilation.patch" />
 +      <patch comment="Fix for 64 bits platforms" name="omninotify.002_64bits.patch" />
      </patches>
    </product>
    <product name="omniorbpy" version="3.6" />
@@@ -127,47 -135,44 +136,48 @@@
    <product name="tcltk" version="8.6.0" />
    <product name="tclx" version="8.4.1" />
    <product name="tbb" version="4.2.4" />
 -  <product name="eigen" version="3.2.7" />
 +  <product name="eigen" version="3.2.7">
 +    <patches>
 +      <patch comment="Replace nullptr with 0" name="eigen.001_replace_nullptr.patch" />
 +    </patches>
 +  </product>
    <product name="planegcs" version="0.16" />
-   <product comment="SALOME Geometry module" name="geom" version="V8_3_0" />
-   <product comment="SALOME GUI module" name="gui" version="V8_3_0" />
-   <product comment="SALOME HexaBlock module" name="hexablock" version="V8_3_0" />
-   <product comment="SALOME Homard module" name="homard" version="V8_3_0" />
-   <product comment="SALOME JobManager module" name="jobmanager" version="V8_3_0" />
-   <product comment="SALOME Kernel module" name="kernel" version="V8_3_0" />
-   <product comment="SALOME Med module" name="med" version="V8_3_0" />
-   <product comment="SALOME ParaVis module" name="paravis" version="V8_3_0" />
-   <product comment="SALOME Mesh module" name="smesh" version="V8_3_0" />
-   <product comment="SALOME YACS module" name="yacs" version="V8_3_0" />
-   <product comment="SALOME MG-CadSurf meshing plugin" name="blsurfplugin" version="V8_3_0" />
-   <product comment="SALOME MG-Tetra meshing plugin" name="ghs3dplugin" version="V8_3_0" />
-   <product comment="SALOME MG-Tetra_HPC meshing plugin" name="ghs3dprlplugin" version="V8_3_0" />
-   <product comment="SALOME MG-Hexa meshing plugin" name="hexoticplugin" version="V8_3_0" />
-   <product comment="SALOME HexaBlock meshing plugin" name="hexablockplugin" version="V8_3_0" />
-   <product comment="SALOME MG-Hybrid meshing plugin" name="hybridplugin" version="V8_3_0" />
-   <product comment="SALOME Netgen meshing plugin" name="netgenplugin" version="V8_3_0" />
-   <product comment="SALOME Documentation tool" name="documentation" version="V8_3_0" />
-   <product comment="SALOME Hxx2salome tool" name="hxx2salome" version="V8_3_0" />
-   <product comment="libBatch library" name="libbatch" version="V8_3_0" />
-   <product comment="SALOME MedCoupling library" name="medcoupling" version="V8_3_0" />
-   <product comment="SALOME Tutorial" name="tutorial" version="V8_3_0" />
-   <product comment="SALOME YacsGen tool" name="yacsgen" version="V8_3_0" />
-   <product comment="SALOME AtomGen sample module" name="atomgen" version="V8_3_0" />
-   <product comment="SALOME Atomic sample module" name="atomic" version="V8_3_0" />
-   <product comment="SALOME AtomSolv sample module" name="atomsolv" version="V8_3_0" />
-   <product comment="SALOME Calculator sample module" name="calculator" version="V8_3_0" />
-   <product comment="SALOME Component sample module" name="component" version="V8_3_0" />
-   <product comment="SALOME data files" name="samples" version="V8_3_0" />
-   <product comment="SALOME DscCode sample module" name="dsccode" version="V8_3_0" />
-   <product comment="SALOME Hello sample module" name="hello" version="V8_3_0" />
-   <product comment="SALOME Light sample module" name="light" version="V8_3_0" />
-   <product comment="SALOME PyCalculator sample module" name="pycalculator" version="V8_3_0" />
-   <product comment="SALOME PyHello sample module" name="pyhello" version="V8_3_0" />
-   <product comment="SALOME PyLight sample module" name="pylight" version="V8_3_0" />
-   <product comment="SALOME Randomizer sample module" name="randomizer" version="V8_3_0" />
-   <product comment="SALOME Sierpinsky sample module" name="sierpinsky" version="V8_3_0" />
+   <product comment="SALOME Geometry module" name="geom" version="V8_4_0" />
+   <product comment="SALOME GUI module" name="gui" version="V8_4_0" />
+   <product comment="SALOME HexaBlock module" name="hexablock" version="V8_4_0" />
+   <product comment="SALOME Homard module" name="homard" version="V8_4_0" />
+   <product comment="SALOME JobManager module" name="jobmanager" version="V8_4_0" />
+   <product comment="SALOME Kernel module" name="kernel" version="V8_4_0" />
+   <product comment="SALOME Med module" name="med" version="V8_4_0" />
+   <product comment="SALOME ParaVis module" name="paravis" version="V8_4_0" />
+   <product comment="SALOME Mesh module" name="smesh" version="V8_4_0" />
+   <product comment="SALOME YACS module" name="yacs" version="V8_4_0" />
+   <product comment="SALOME MG-CadSurf meshing plugin" name="blsurfplugin" version="V8_4_0" />
+   <product comment="SALOME MG-Tetra meshing plugin" name="ghs3dplugin" version="V8_4_0" />
+   <product comment="SALOME MG-Tetra_HPC meshing plugin" name="ghs3dprlplugin" version="V8_4_0" />
+   <product comment="SALOME MG-Hexa meshing plugin" name="hexoticplugin" version="V8_4_0" />
+   <product comment="SALOME HexaBlock meshing plugin" name="hexablockplugin" version="V8_4_0" />
+   <product comment="SALOME MG-Hybrid meshing plugin" name="hybridplugin" version="V8_4_0" />
+   <product comment="SALOME Netgen meshing plugin" name="netgenplugin" version="V8_4_0" />
+   <product comment="SALOME Gmsh meshing plugin" name="gmshplugin" version="V8_4_0" />
+   <product comment="SALOME Documentation tool" name="documentation" version="V8_4_0" />
+   <product comment="SALOME Hxx2salome tool" name="hxx2salome" version="V8_4_0" />
+   <product comment="libBatch library" name="libbatch" version="V2_3_2" />
+   <product comment="SALOME MedCoupling library" name="medcoupling" version="V8_4_0" />
+   <product comment="SALOME Tutorial" name="tutorial" version="V8_4_0" />
+   <product comment="SALOME YacsGen tool" name="yacsgen" version="V8_4_0" />
+   <product comment="SALOME AtomGen sample module" name="atomgen" version="V8_4_0" />
+   <product comment="SALOME Atomic sample module" name="atomic" version="V8_4_0" />
+   <product comment="SALOME AtomSolv sample module" name="atomsolv" version="V8_4_0" />
+   <product comment="SALOME Calculator sample module" name="calculator" version="V8_4_0" />
+   <product comment="SALOME Component sample module" name="component" version="V8_4_0" />
+   <product comment="SALOME data files" name="samples" version="V8_4_0" />
+   <product comment="SALOME DscCode sample module" name="dsccode" version="V8_4_0" />
+   <product comment="SALOME Hello sample module" name="hello" version="V8_4_0" />
+   <product comment="SALOME Light sample module" name="light" version="V8_4_0" />
+   <product comment="SALOME PyCalculator sample module" name="pycalculator" version="V8_4_0" />
+   <product comment="SALOME PyHello sample module" name="pyhello" version="V8_4_0" />
+   <product comment="SALOME PyLight sample module" name="pylight" version="V8_4_0" />
+   <product comment="SALOME Randomizer sample module" name="randomizer" version="V8_4_0" />
+   <product comment="SALOME Sierpinsky sample module" name="sierpinsky" version="V8_4_0" />
  </config>