Merge branch 'V7_dev'

diff --cc CMakeLists.txt
Simple merge

diff --cc SalomeGUIConfig.cmake.in
Simple merge

diff --cc adm_local/cmake_files/CMakeLists.txt
Simple merge

diff --cc adm_local/cmake_files/FindSalomeParaView.cmake
Simple merge

diff --cc adm_local/cmake_files/UsePyQt.cmake
index c9f747780f6a99a980ceb7ee7ff20979e42f5687,0000000000000000000000000000000000000000..1c07ecd5c0155aade0737fdbf13c7fd7adbcf87b
mode 100644,000000..100644
--- 1/adm_local/cmake_files/UsePyQt.cmake
--- /dev/null
+++ b/adm_local/cmake_files/UsePyQt.cmake
@@@ -1,161 -1,0 +1,161 @@@
- # Copyright (C) 2012-2015  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 +#
 +# This library is free software; you can redistribute it and/or
 +# modify it under the terms of the GNU Lesser General Public
 +# License as published by the Free Software Foundation; either
 +# version 2.1 of the License, or (at your option) any later version.
 +#
 +# This library is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 +# Lesser General Public License for more details.
 +#
 +# You should have received a copy of the GNU Lesser General Public
 +# License along with this library; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 +#
 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 +#
 +# Author: Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 +
 +INCLUDE(UseSIP)
 +
 +####################################################################
 +#
 +# _PYQT_WRAP_GET_UNIQUE_TARGET_NAME: internal function
 +# 
 +# Used to generate unique custom target name for usage in
 +# PYQT_WRAP_UIC macro.
 +#
 +# USAGE: _PYQT_WRAP_GET_UNIQUE_TARGET_NAME(prefix unique_name)
 +#
 +# ARGUMENTS:
 +#   prefix [in] prefix for the name
 +#   unique_name [out] unique name generated by function
 +#
 +####################################################################
 +FUNCTION(_PYQT_WRAP_GET_UNIQUE_TARGET_NAME name unique_name)
 +   SET(_propertyName "_PYQT_WRAP_UNIQUE_COUNTER_${name}")
 +   GET_PROPERTY(_currentCounter GLOBAL PROPERTY "${_propertyName}")
 +   IF(NOT _currentCounter)
 +      SET(_currentCounter 1)
 +   ENDIF()
 +   SET(${unique_name} "${name}_${_currentCounter}" PARENT_SCOPE)
 +   MATH(EXPR _currentCounter "${_currentCounter} + 1")
 +   SET_PROPERTY(GLOBAL PROPERTY ${_propertyName} ${_currentCounter} )
 +ENDFUNCTION()
 +
 +####################################################################
 +#
 +# PYQT_WRAP_UIC macro
 +#
 +# Create Python modules by processing input *.ui (Qt designer) files with
 +# PyQt pyuic tool.
 +#
 +# USAGE: PYQT_WRAP_UIC(output_files pyuic_files)
 +#
 +# ARGUMENTS:
 +#   output_files [out] variable where output file names are listed to
 +#   pyuic_files  [in]  list of *.ui files
 +# 
 +# NOTES:
 +#   - Input files are considered relative to the current source directory.
 +#   - Output files are generated in the current build directory.
 +#   - Macro automatically adds custom build target to generate output files
 +# 
 +####################################################################
 +MACRO(PYQT_WRAP_UIC outfiles)
 +
 + IF(NOT WIN32)
 +
 +  FOREACH(_input ${ARGN})
 +    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} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input}
 +      MAIN_DEPENDENCY ${_input}
 +      )
 +    SET(${outfiles} ${${outfiles}} ${_output})
 +  ENDFOREACH()
 +  _PYQT_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_UI_PY_FILES _uniqueTargetName)
 +  ADD_CUSTOM_TARGET(${_uniqueTargetName} ALL DEPENDS ${${outfiles}})
 +
 + ELSE(NOT WIN32)
 +
 +####
 +# ANA: Workaround for the Microsoft Visual Studio 2010. Seems there is a bug in 
 +# the Microsoft Visual Studio 2010 or CMake 2.8.10.2: custom target doesn't work 
 +# for the list of the dependencies. It works only for the first dependency in the 
 +# list. So generate separate target for the each input file. This problem will be 
 +#investigated in the future.
 +####
 +
 +  SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
 +  _PYQT_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_UI_PY_FILES _uniqueTargetName)
 +  ADD_CUSTOM_TARGET(${_uniqueTargetName} ALL)
 +  FOREACH(_input ${ARGN})
 +    GET_FILENAME_COMPONENT(_input_name ${_input} NAME)
 +    STRING(REPLACE ".ui" "_ui.py" _input_name ${_input_name})
 +    SET(_output ${CMAKE_CURRENT_BINARY_DIR}/${_input_name})
 +    _PYQT_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_UI_PY_FILES _TgName)
 +    ADD_CUSTOM_TARGET(${_TgName} ${PYQT_PYUIC_PATH} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input}
 +      DEPENDS ${_input}
 +      )
 +    SET_TARGET_PROPERTIES(${_TgName} PROPERTIES FOLDER PYQT_WRAP_UIC_TARGETS)
 +    ADD_DEPENDENCIES(${_uniqueTargetName} DEPEND ${_TgName})
 +    SET(${outfiles} ${${outfiles}} ${_output})
 +  ENDFOREACH()
 + ENDIF(NOT WIN32)
 +ENDMACRO(PYQT_WRAP_UIC)
 +
 +####################################################################
 +#
 +# PYQT_WRAP_SIP macro
 +#
 +# Generate C++ wrappings for *.sip files by processing them with sip.
 +#
 +# USAGE: PYQT_WRAP_SIP(output_files sip_file [sip_file...] [OPTIONS options] [SOURCES sources])
 +#
 +# NOTES: See SIP_WRAP_SIP macro from UseSIP.cmake for the usage description.
 +# 
 +####################################################################
 +MACRO(PYQT_WRAP_SIP outfiles)
 +  SIP_WRAP_SIP(${outfiles} ${ARGN} OPTIONS ${PYQT_SIPFLAGS})
 +ENDMACRO(PYQT_WRAP_SIP)
 +
 +####################################################################
 +#
 +# PYQT_WRAP_QRC macro
 +#
 +# Generate Python wrappings for *.qrc files by processing them with pyrcc5.
 +#
 +# USAGE: PYQT_WRAP_QRC(output_files qrc_files)
 +#
 +# ARGUMENTS:
 +#   output_files [out] variable where output file names are listed to
 +#   qrc_files  [in]  list of *.qrc files
 +# 
 +# NOTES:
 +#   - Input files are considered relative to the current source directory.
 +#   - Output files are generated in the current build directory.
 +#   - Macro automatically adds custom build target to generate output files
 +# 
 +####################################################################
 +
 +MACRO(PYQT_WRAP_QRC outfiles)
 +  FOREACH(_input ${ARGN})
 +    GET_FILENAME_COMPONENT(_input_name ${_input} NAME)
 +    STRING(REPLACE ".qrc" "_qrc.py" _input_name ${_input_name})
 +    SET(_output ${CMAKE_CURRENT_BINARY_DIR}/${_input_name})
 +    ADD_CUSTOM_COMMAND(
 +      OUTPUT ${_output}
 +      COMMAND ${PYQT_PYRCC_PATH} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input}
 +      MAIN_DEPENDENCY ${_input}
 +      )
 +    SET(${outfiles} ${${outfiles}} ${_output})
 +  ENDFOREACH()
 +  _PYQT_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_QRC_PY_FILES _uniqueTargetName)
 +  ADD_CUSTOM_TARGET(${_uniqueTargetName} ALL DEPENDS ${${outfiles}})
 +ENDMACRO(PYQT_WRAP_QRC)

diff --cc adm_local/cmake_files/UseQtExt.cmake
index 03e40f2ac408cee4d1df6f2349907b891100c916,0000000000000000000000000000000000000000..95985b7b794f8d1de948984bbe6347c1742c63a5
mode 100644,000000..100644
--- 1/adm_local/cmake_files/UseQtExt.cmake
--- /dev/null
+++ b/adm_local/cmake_files/UseQtExt.cmake
@@@ -1,68 -1,0 +1,68 @@@
- # Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
++# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 +#
 +# This library is free software; you can redistribute it and/or
 +# modify it under the terms of the GNU Lesser General Public
 +# License as published by the Free Software Foundation; either
 +# version 2.1 of the License, or (at your option) any later version.
 +#
 +# This library is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 +# Lesser General Public License for more details.
 +#
 +# You should have received a copy of the GNU Lesser General Public
 +# License along with this library; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 +#
 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 +#
 +
 +IF (QT_VERSION VERSION_LESS "5.0")
 +  INCLUDE(${QT_USE_FILE})
 +ENDIF()
 +
 +INSTALL(CODE "MACRO(QT_COMPILE_TS_ON_INSTALL MYLRELEASE MYTSFILE MYFULLDIR MYOUTQMFILE)
 +  FILE(MAKE_DIRECTORY \${MYFULLDIR})
 +  MESSAGE(STATUS \"Compiling \${MYTSFILE}\")
 +  EXECUTE_PROCESS(COMMAND \${MYLRELEASE} \${MYTSFILE} -qm \${MYFULLDIR}/\${MYOUTQMFILE})
 +ENDMACRO(QT_COMPILE_TS_ON_INSTALL)")
 +
 +# This MACRO uses the following vars
 +# - QT_LRELEASE_EXECUTABLE : (given by default by FindQT.cmake)
 +#
 +# MYTSFILES containing all ts files to be compiled.
 +# WHERETOINSTALL contains directory (relative to install_prefix) where to install files after compilation of ts files too qm.
 +MACRO(QT_INSTALL_TS_RESOURCES MYTSFILES WHERETOINSTALL)
 +  INSTALL(CODE "SET(INSTALL_TS_DIR ${WHERETOINSTALL})")
 +  SET(MYSOURCES)
 +  FOREACH(input ${MYTSFILES})
 +    GET_FILENAME_COMPONENT(input2 ${input} NAME)
 +    STRING(REGEX REPLACE ".ts" "" base ${input2})
 +    SET(output "${base}.qm")
 +    INSTALL(CODE "QT_COMPILE_TS_ON_INSTALL( \"${QT_LRELEASE_EXECUTABLE}\" \"${CMAKE_CURRENT_SOURCE_DIR}/${input}\" \"${CMAKE_INSTALL_PREFIX}/\${INSTALL_TS_DIR}\" ${output})")
 +  ENDFOREACH(input ${MYIDLFILES})
 +ENDMACRO(QT_INSTALL_TS_RESOURCES)
 +
 +MACRO(QT_WRAP_MOC)
 +IF (QT_VERSION VERSION_LESS "5.0")
 +  QT4_WRAP_CPP(${ARGN})
 +ELSE()
 +  QT5_WRAP_CPP(${ARGN})
 +ENDIF()
 +ENDMACRO(QT_WRAP_MOC)
 +
 +MACRO(QT_WRAP_UIC)
 +IF (QT_VERSION VERSION_LESS "5.0")
 +  QT4_WRAP_UI(${ARGN})
 +ELSE()
 +  QT5_WRAP_UI(${ARGN})
 +ENDIF()
 +ENDMACRO(QT_WRAP_UIC)
 +
 +MACRO(QT_ADD_RESOURCES)
 +IF (QT_VERSION VERSION_LESS "5.0")
 +  QT4_ADD_RESOURCES(${ARGN})
 +ELSE()
 +  QT5_ADD_RESOURCES(${ARGN})
 +ENDIF()
 +ENDMACRO(QT_ADD_RESOURCES)

diff --cc src/CAF/CMakeLists.txt
index a344486046a0598d2d590f12157dfdfd7cd2c514,29b844282aa37a2c26f02e4bf560f72dc8c01926..6872baf2c384acf7c3b62cece07a63a5c1da6431
--- 1/src/CAF/CMakeLists.txt
--- 2/src/CAF/CMakeLists.txt
+++ b/src/CAF/CMakeLists.txt
@@@ -86,4 -86,4 +86,4 @@@ TARGET_LINK_LIBRARIES(caf ${QT_LIBRARIE
  INSTALL(TARGETS caf EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
  
  INSTALL(FILES ${caf_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
- QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
 -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
++QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")

diff --cc src/CAM/CAM_Module.cxx
Simple merge

diff --cc src/CAM/CAM_Module.h
Simple merge

diff --cc src/CAM/CMakeLists.txt
index 012c32b5e95b8086e682012292f9c7a7f10479c8,bb2f139a4f8d73e66623265f5d43880789a430d5..206f88e45a3e686e2f39178f56f34281cc0f9e1d
--- 1/src/CAM/CMakeLists.txt
--- 2/src/CAM/CMakeLists.txt
+++ b/src/CAM/CMakeLists.txt
@@@ -88,4 -88,4 +88,4 @@@ TARGET_LINK_LIBRARIES(CAM ${_link_LIBRA
  INSTALL(TARGETS CAM EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
  
  INSTALL(FILES ${CAM_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
- QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
 -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
++QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")

diff --cc src/DDS/CMakeLists.txt
Simple merge

diff --cc src/GLViewer/CMakeLists.txt
Simple merge

diff --cc src/GLViewer/GLViewer_BaseObjects.cxx
Simple merge

diff --cc src/GLViewer/GLViewer_Drawer.cxx
Simple merge

diff --cc src/GLViewer/GLViewer_ViewPort.cxx
Simple merge

diff --cc src/GLViewer/GLViewer_Viewer.cxx
Simple merge

diff --cc src/GLViewer/GLViewer_Viewer2d.cxx
Simple merge

diff --cc src/GUI_PY/CMakeLists.txt
Simple merge

diff --cc src/GUI_PY/dockwidgets.py
index 2d370e905e73e70ef95c60dda72842f0335baf9e,e6e10bcf9a8038850715fcdfb43aa42374f55833..08a9bc77be36580be2fd70d84c42f43e8ca8f1c9
--- 1/src/GUI_PY/dockwidgets.py
--- 2/src/GUI_PY/dockwidgets.py
+++ b/src/GUI_PY/dockwidgets.py
@@@ -1,4 -1,24 +1,23 @@@
 -from PyQt4.QtCore import *
 -from PyQt4.QtGui import *
+ # Copyright (C) 2014-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+ #
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU Lesser General Public
+ # License as published by the Free Software Foundation; either
+ # version 2.1 of the License, or (at your option) any later version.
+ #
+ # This library is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ # Lesser General Public License for more details.
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this library; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ #
+ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ #
+ 
 +from qtsalome import *
  
  import SalomePyQt
  

diff --cc src/GUI_PY/genericdialog.py
Simple merge

diff --cc src/GUI_PY/mytestdialog.py
Simple merge

diff --cc src/GUI_PY/selectvars.py
Simple merge

diff --cc src/GraphicsView/CMakeLists.txt
Simple merge

diff --cc src/GuiHelpers/CMakeLists.txt
Simple merge

diff --cc src/HelpBrowser/CMakeLists.txt
Simple merge

diff --cc src/LightApp/CMakeLists.txt
Simple merge

diff --cc src/LightApp/LightApp_Application.cxx
Simple merge

diff --cc src/LightApp/resources/LightApp.xml
Simple merge

diff --cc src/LogWindow/CMakeLists.txt
Simple merge

diff --cc src/OCCViewer/CMakeLists.txt
Simple merge

diff --cc src/OCCViewer/OCCViewer_ViewPort.cxx
Simple merge

diff --cc src/OCCViewer/OCCViewer_ViewPort3d.cxx
Simple merge

diff --cc src/OCCViewer/OCCViewer_ViewSketcher.cxx
Simple merge

diff --cc src/OCCViewer/OCCViewer_ViewWindow.cxx
Simple merge

diff --cc src/ObjBrowser/CMakeLists.txt
Simple merge

diff --cc src/PVViewer/CMakeLists.txt
Simple merge

diff --cc src/Plot2d/CMakeLists.txt
Simple merge

diff --cc src/PyConsole/CMakeLists.txt
index a2f3b46363a9975599b3fa75b4f5b5f56866a691,bc49aebc68abd454f5c8a18458ddbfdaf22cc96e..713769e8b1f81716b186feacf7405ff2c30ea6aa
--- 1/src/PyConsole/CMakeLists.txt
--- 2/src/PyConsole/CMakeLists.txt
+++ b/src/PyConsole/CMakeLists.txt
@@@ -93,5 -86,4 +86,4 @@@ TARGET_LINK_LIBRARIES(PyConsole ${_link
  INSTALL(TARGETS PyConsole EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
  
  INSTALL(FILES ${PyConsole_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
 +QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
- 

diff --cc src/PyEditor/CMakeLists.txt
Simple merge

diff --cc src/PyInterp/CMakeLists.txt
index 07cef33dbdfd82ec26bf5926fb1ec1075a7c2c5c,987380dac8d9457b5126b735c5f38ac1f7b121ff..d44a73ff3063df2884840b6a91429fc93f1020ab
--- 1/src/PyInterp/CMakeLists.txt
--- 2/src/PyInterp/CMakeLists.txt
+++ b/src/PyInterp/CMakeLists.txt
@@@ -56,7 -55,7 +55,7 @@@ SET(PyInterp_HEADERS ${_moc_HEADERS} ${
  # --- sources ---
  
  # sources / moc wrappings
- QT_WRAP_MOC(_moc_SOURCES ${_moc_internal_HEADERS})
 -QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
++QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
  
  # sources / static
  SET(_other_SOURCES

diff --cc src/PyViewer/CMakeLists.txt
Simple merge

diff --cc src/QDS/CMakeLists.txt
Simple merge

diff --cc src/Qtx/CMakeLists.txt
Simple merge

diff --cc src/Qtx/QtxAction.cxx
Simple merge

diff --cc src/Qtx/QtxAction.h
Simple merge

diff --cc src/Qtx/QtxDialog.cxx
Simple merge

diff --cc src/Qtx/QtxLogoMgr.cxx
Simple merge

diff --cc src/Qtx/QtxPopupMgr.cxx
Simple merge

diff --cc src/Qtx/QtxTranslator.cxx
Simple merge

diff --cc src/Qtx/QtxTranslator.h
Simple merge

diff --cc src/Qtx/QtxTreeView.cxx
Simple merge

diff --cc src/Qtx/QtxWorkspaceAction.cxx
Simple merge

diff --cc src/Qtx/QtxWorkstack.cxx
Simple merge

diff --cc src/Qtx/QtxWorkstackAction.cxx
Simple merge

diff --cc src/QxScene/CMakeLists.txt
Simple merge

diff --cc src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt
Simple merge

diff --cc src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
Simple merge

diff --cc src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.sip
Simple merge

diff --cc src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
Simple merge

diff --cc src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
Simple merge

diff --cc src/SOCC/CMakeLists.txt
Simple merge

diff --cc src/SPlot2d/CMakeLists.txt
Simple merge

diff --cc src/STD/CMakeLists.txt
Simple merge

diff --cc src/SUIT/CMakeLists.txt
Simple merge

diff --cc src/SUIT/SUIT_ActionOperation.cxx
Simple merge

diff --cc src/SUIT/SUIT_Application.cxx
Simple merge

diff --cc src/SUIT/SUIT_Application.h
Simple merge

diff --cc src/SUIT/SUIT_DataBrowser.cxx
Simple merge

diff --cc src/SUIT/SUIT_FileDlg.cxx
Simple merge

diff --cc src/SUIT/SUIT_TreeModel.cxx
Simple merge

diff --cc src/SUITApp/CMakeLists.txt
Simple merge

diff --cc src/SUITApp/SUITApp.cxx
Simple merge

diff --cc src/SUITApp/SUITApp_Application.cxx
Simple merge

diff --cc src/SUITApp/SUITApp_Application.h
Simple merge

diff --cc src/SVTK/CMakeLists.txt
index d2a4072e9d88aec1610e6cc95c1e0234e756b6be,dd03219cd74e5721d89768820627abe3c10b7e70..53dcf7e84da194a739c4b45f04dd7a46ba2618d3
--- 1/src/SVTK/CMakeLists.txt
--- 2/src/SVTK/CMakeLists.txt
+++ b/src/SVTK/CMakeLists.txt
@@@ -196,6 -196,7 +196,6 @@@ TARGET_LINK_LIBRARIES(SVTK ${_link_LIBR
  INSTALL(TARGETS SVTK EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
  
  INSTALL(FILES ${SVTK_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
 +QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
  
- INSTALL(FILES ${_other_RESOURCES} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})
+ INSTALL(FILES ${_other_RESOURCES} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})
 -

diff --cc src/SVTK/SVTK_RenderWindowInteractor.cxx
Simple merge

diff --cc src/SVTK/SVTK_RenderWindowInteractor.h
Simple merge

diff --cc src/SVTK/SVTK_SpaceMouse.cxx
Simple merge

diff --cc src/SVTK/SVTK_SpaceMouse.h
Simple merge

diff --cc src/SalomeApp/CMakeLists.txt
Simple merge

diff --cc src/SalomeApp/SalomeApp_ListView.cxx
Simple merge

diff --cc src/SalomeApp/pluginsdemo/CMakeLists.txt
Simple merge

diff --cc src/SalomeApp/pluginsdemo/minmax_plugin.py
Simple merge

diff --cc src/SalomeApp/pluginsdemo/tubedialog.py
Simple merge

diff --cc src/SalomeApp/pluginsdemo/tubedialog_ui.py
Simple merge

diff --cc src/SalomeApp/salome_pluginsmanager.py
Simple merge

diff --cc src/Session/SALOME_Session_Server.cxx
Simple merge

diff --cc src/Style/CMakeLists.txt
Simple merge

diff --cc src/Style/Style_Salome.cxx
Simple merge

diff --cc src/Style/Style_Salome.h
Simple merge

diff --cc src/TOOLSGUI/CMakeLists.txt
index db9f680edc12350dd63ec93436558c0b8a58b797,94ed39d56660cb6f3ee126d39be1e0cd1ad6a0fd..d391fc67668282a1c94fc58738feaa673894eae2
--- 1/src/TOOLSGUI/CMakeLists.txt
--- 2/src/TOOLSGUI/CMakeLists.txt
+++ b/src/TOOLSGUI/CMakeLists.txt
@@@ -97,4 -97,5 +97,4 @@@ TARGET_LINK_LIBRARIES(ToolsGUI ${_link_
  INSTALL(TARGETS ToolsGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
  
  INSTALL(FILES ${ToolsGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
- QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
 -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
 -
++QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")

diff --cc src/TreeData/CMakeLists.txt
Simple merge

diff --cc src/TreeData/Test/CMakeLists.txt
Simple merge

diff --cc src/VTKViewer/CMakeLists.txt
Simple merge

diff --cc src/VTKViewer/VTKViewer_RenderWindow.cxx
Simple merge

diff --cc src/ViewerTools/CMakeLists.txt
Simple merge

diff --cc tools/dlgfactory/CMakeLists.txt
Simple merge