Merge remote branch 'origin/V7_dev'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eaa4571c00b2c5e67897b0908864daa0eb6add36..5dbce59d221d15b6068500cd8a89a316e3635583 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,8 @@ CMAKE_POLICY(SET CMP0003 NEW)
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
@@ -110,9 +110,12 @@ ENDIF(SALOME_BUILD_GUI)
 ## From GUI
 ##
 IF(SALOME_BUILD_GUI)
-  # Qt4
-  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
-  INCLUDE(${QT_USE_FILE})
+  # Qt
+  IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+    FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
+  ELSE()
+    FIND_PACKAGE(SalomeQt5 REQUIRED)
+  ENDIF()
 ENDIF(SALOME_BUILD_GUI)
 
 # VTK

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 243d31aab5ac01e4d715710f1ef4b12878ff2629..e308e12e3431552dd45efc722113f454c71cf295 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 # additional include directories
@@ -69,7 +69,7 @@ SET(GHS3DPRLPluginGUI_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${GHS3DPRLPluginGUI_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${GHS3DPRLPluginGUI_HEADERS})
 
 # sources / static
 SET(_other_SOURCES
@@ -98,4 +98,4 @@ INSTALL(TARGETS GHS3DPRLPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION
 
 INSTALL(FILES ${GHS3DPRLPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GHS3DPRLPLUGIN_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GHS3DPRLPLUGIN_INSTALL_RES_DATA}")

diff --git a/src/tepal2med/CMakeLists.txt b/src/tepal2med/CMakeLists.txt
index c5641ccb6c47933a82e7fe871faca3440042b02a..37b7118d2e8e967d1869d3ccc1c7b9715b1fd34e 100644 (file)
--- a/src/tepal2med/CMakeLists.txt
+++ b/src/tepal2med/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 # additional include directories
@@ -59,7 +59,7 @@ SET(tepal2med_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 # sources / static
 SET(_other_SOURCES
@@ -74,7 +74,7 @@ SET(_uic_files
 )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # sources / to compile
 SET(tepal2med_SOURCES tepal2med.cxx ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS})