Merge Qt5 porting.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c545fd3c7a407fee587c63698a3530a4a23d4627..4ee9e34a325dad48a2f12535fba7df847168fe50 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,9 +109,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 2f3735570ebc0cdadecf05ce55f675c0ac542b80..be7056bcac2e99154efd02910f4bc5dc55e7832a 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 a6dc98793c7552253fb80ab268b9032062378ac9..60714f353c87feba6d19e2b9de7453d014469089 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})

diff --git a/src/tepal2med/ghs3dprl_mesh_wrap.h b/src/tepal2med/ghs3dprl_mesh_wrap.h
index 2348ec01b12f7948eff19b384efa60cd95112972..925a724f10941cd7ee0ba7880b925013e12b9c79 100755 (executable)
--- a/src/tepal2med/ghs3dprl_mesh_wrap.h
+++ b/src/tepal2med/ghs3dprl_mesh_wrap.h
@@ -158,9 +158,9 @@ public:
    bool ReadFilePOINTS(const QString FileName);
    bool Find_VerticesDomainToVerticesSkin();
    bool Write_masterxmlMEDfile();
-   bool Write_MEDfiles_v0(bool deletekeys=FALSE); 
-   bool Write_MEDfiles_v1(bool deletekeys=FALSE); 
-   bool Write_MEDfiles_v2(bool deletekeys=FALSE);
+   bool Write_MEDfiles_v0(bool deletekeys=false); 
+   bool Write_MEDfiles_v1(bool deletekeys=false); 
+   bool Write_MEDfiles_v2(bool deletekeys=false);
 };
 
 #endif