Update qt 5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62fa45d05d3e1facb4c8c1dec96c241579e08334..d99188ecf7c4f5c6494649196b76a1ace307e468 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,6 @@ ENDIF(EXISTS ${KERNEL_ROOT_DIR})
 # ============
 OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
 OPTION(SALOME_BUILD_DOC "Generate SALOME SALOME documentation" ON)
-OPTION(SALOME_BUILD_WITH_QT5 "Build SALOME with Qt 5" OFF)
 
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
@@ -83,15 +82,12 @@ ELSE(EXISTS ${GUI_ROOT_DIR})
 ENDIF(EXISTS ${GUI_ROOT_DIR})
 
 # Qt
-IF(NOT SALOME_BUILD_WITH_QT5)
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
   FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 ELSE()
   FIND_PACKAGE(SalomeQt5 REQUIRED)
 ENDIF()
 
-#FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-#INCLUDE(${QT_USE_FILE})
-
 # Directories
 # (default values taken from KERNEL)
 # ===========

diff --git a/src/resources/CMakeLists.txt b/src/resources/CMakeLists.txt
index 7098eb52d0aa952bc56ffee13ad85493fee95e5a..d10001d18ac351a93ca2c590ac37a4e324259047 100644 (file)
--- a/src/resources/CMakeLists.txt
+++ b/src/resources/CMakeLists.txt
@@ -31,4 +31,4 @@ SET(_ts_RESOURCES
 
 # --- rules ---
 
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SALOME_PROFILE_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SALOME_PROFILE_INSTALL_RES_DATA}")