From: vsr <vsr@opencascade.com>
Date: Thu, 14 Jan 2016 15:03:04 +0000 (+0300)
Subject: Merge branch 'V8_0_BR'
X-Git-Tag: V8_0_0a2^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=529bc70dc8dd73f61f7311f1a882eca5923b6e70;p=modules%2Fgeom.git

Merge branch 'V8_0_BR'
---

529bc70dc8dd73f61f7311f1a882eca5923b6e70
diff --cc CMakeLists.txt
index 4dc80fd57,66d01b356..cd26147d5
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -124,10 -124,12 +124,17 @@@ ENDIF(SALOME_BUILD_GUI
  ##
  
  IF(SALOME_BUILD_GUI)
- 
-   # Qt4
-   FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
-   FIND_PACKAGE(SalomePyQt4)
 -  # Qt
+   IF(NOT SALOME_GUI_BUILD_WITH_QT5)
++    # Qt
+     FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtWebKit QtOpenGL QtNetwork)
++    # PyQt
++    FIND_PACKAGE(SalomePyQt4 REQUIRED)
+   ELSE()
++    # Qt
+     FIND_PACKAGE(SalomeQt5 REQUIRED)
++    # PyQt
++    FIND_PACKAGE(SalomePyQt5 REQUIRED)
+   ENDIF()
  ENDIF(SALOME_BUILD_GUI)
  
  ##
diff --cc src/Tools/t_shape/CMakeLists.txt
index 15394fdb2,000000000..e4332a5e7
mode 100644,000000..100644
--- a/src/Tools/t_shape/CMakeLists.txt
+++ b/src/Tools/t_shape/CMakeLists.txt
@@@ -1,55 -1,0 +1,55 @@@
 +# Copyright (C) 2012-2014  EDF R&D
 +#
 +# 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(SALOME_BUILD_GUI)
-   INCLUDE(UsePyQt4)
++  INCLUDE(UsePyQt)
 +ENDIF()
 +
 +# --- scripts ---
 +
 +# base scripts
 +SET(base_SCRIPTS
 +  __init__.py
 +  t_shape_builder.py
 +  )
 +
 +IF(SALOME_BUILD_GUI)
 +   # gui scripts 
 +   SET(gui_SCRIPTS
 +     t_shape_dialog.py
 +     t_shape_dialog.ui
 +     t_shape_progress.py
 +     )
 +
 +  # uic files / to be processed by pyuic
 +  SET(_pyuic_files
 +    t_shape_dialog.ui
 +    )
 +
 +  # scripts / pyuic wrappings
-   PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
++  PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
 +ENDIF()
 +
 +# --- rules ---
 +
 +SALOME_INSTALL_SCRIPTS("${base_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape)
 +
 +IF(SALOME_BUILD_GUI)
 +  SALOME_INSTALL_SCRIPTS("${gui_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape)
 +  SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape)
 +ENDIF()