From: CEA Support SALOME <support-salome@cea.fr>
Date: Tue, 26 Jan 2016 09:21:34 +0000 (+0100)
Subject: Update qt 5
X-Git-Tag: V8.0.0beta
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=32b0f6ff6de88fcb8da7cffcd2c86d8cccbb065e;p=tools%2FSALOME.git

Update qt 5
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62fa45d..d99188e 100644
--- 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 7098eb5..d10001d 100644
--- 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}")