Migrate to Qt 5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14dfc6dbc30d3c017096109d133a4343619a5c6b..85a7aed901b422e5ffb31f6081471e4de4b25aaf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,7 +111,12 @@ FIND_PACKAGE(SalomeCR REQUIRED)
 FIND_PACKAGE(SalomeOmniORB REQUIRED)
 FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 IF(SALOME_BUILD_GUI)
-  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+  IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+    FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+    INCLUDE(${QT_USE_FILE})
+  ELSE()
+    FIND_PACKAGE(SalomeQt5 REQUIRED)
+  ENDIF()
 ENDIF(SALOME_BUILD_GUI)
 IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeDoxygen)

diff --git a/src/CANRECPLUGINGUI/CMakeLists.txt b/src/CANRECPLUGINGUI/CMakeLists.txt
index 3d3cf4d457d101b25f23125e420d05eefd87a481..b866008f08bda63998ea87f19183d3654c29fd89 100644 (file)
--- a/src/CANRECPLUGINGUI/CMakeLists.txt
+++ b/src/CANRECPLUGINGUI/CMakeLists.txt
@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 # additional include directories
@@ -71,7 +70,7 @@ SET(CANRECPluginGUI_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
@@ -100,4 +99,4 @@ INSTALL(TARGETS CANRECPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${
 
 INSTALL(FILES ${CANRECPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_CANRECPLUGIN_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_CANRECPLUGIN_INSTALL_RES_DATA}")