Merge branch 'V7_dev'

diff --cc CMakeLists.txt
Simple merge

diff --cc src/PYHELLOGUI/CMakeLists.txt
index 05079a239171f856ea74f22f6f87e887e477fe23,1bda2deebb4c2dbb69900a65697fd1c1385bca58..58b87b1d5fa60c711d955952284935a86e7367fc
--- 1/src/PYHELLOGUI/CMakeLists.txt
--- 2/src/PYHELLOGUI/CMakeLists.txt
+++ b/src/PYHELLOGUI/CMakeLists.txt
@@@ -44,4 -44,4 +44,4 @@@ SET(_ts_RESOURCE
  # --- rules ---
  
  SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
- QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PYHELLO_INSTALL_RES_DATA}")
 -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PYHELLO_INSTALL_RES_DATA}")
++QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PYHELLO_INSTALL_RES_DATA}")

diff --cc src/PYHELLOGUI/PYHELLOGUI.py
Simple merge