Merge Qt5 porting.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98dcd72a6f4fd6ade35cb171e67dbb86dd3f5085..98aabaa48082f6cdd8e2e63217054a89c998ba1c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,9 +89,12 @@ ENDIF(EXISTS ${GUI_ROOT_DIR})
 ##
 ## From GUI:
 ##
-# Qt4
-FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-INCLUDE(${QT_USE_FILE})
+# Qt
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+ELSE()
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
+ENDIF()
 
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()

diff --git a/src/PYHELLOGUI/CMakeLists.txt b/src/PYHELLOGUI/CMakeLists.txt
index 9eac4ee9b0fa03601fb5da21b1a67c9e2cbb5f56..05079a239171f856ea74f22f6f87e887e477fe23 100755 (executable)
--- a/src/PYHELLOGUI/CMakeLists.txt
+++ b/src/PYHELLOGUI/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
@@ -44,4 +44,4 @@ SET(_ts_RESOURCES
 # --- rules ---
 
 SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PYHELLO_INSTALL_RES_DATA}")
\ No newline at end of file
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PYHELLO_INSTALL_RES_DATA}")
\ No newline at end of file